Merge branch 'main' into gizmos-v1

Author: rodlie

src/app/memorychecker.cpp

@@ -99,11 +99,13 @@ void MemoryChecker::sGetFreeKB(intKB& procFreeKB, intKB& sysFreeKB)
                                               &physical_memory_used,
                                               &bytes_in_use_by_app);
 #elif defined(Q_OS_MACOS)
-    struct mach_task_basic_info info;
-    mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
-    if ( task_info( mach_task_self( ), MACH_TASK_BASIC_INFO,
-        (task_info_t)&info, &infoCount ) == KERN_SUCCESS ) {
-        bytes_in_use_by_app = info.resident_size;
+    task_vm_info_data_t vm_info;
+    mach_msg_type_number_t vm_info_count = TASK_VM_INFO_COUNT;
+    if (task_info(mach_task_self(),
+                  TASK_VM_INFO,
+                  (task_info_t)&vm_info,
+                  &vm_info_count) == KERN_SUCCESS) {
+        bytes_in_use_by_app = vm_info.phys_footprint;
     }
 #endif