2 files changed, 13 insertions, 24 deletions
diff --git a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
index e2f1ed45ea..b968945ac6 100644
--- a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
@@ -1,12 +1,20 @@
-# Generated from qmacautoreleasepool.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qmacautoreleasepool Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qmacautoreleasepool LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qmacautoreleasepool
     SOURCES
         tst_qmacautoreleasepool.mm
-    PUBLIC_LIBRARIES
+    LIBRARIES
+        Qt::CorePrivate
         ${FWFoundation}
 )
diff --git a/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm b/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
index dff8b4a3e7..e7923b47f3 100644
--- a/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
+++ b/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
@@ -1,8 +1,10 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include <Foundation/Foundation.h>
 
 class tst_QMacAutoreleasePool : public QObject
@@ -12,7 +14,6 @@ private slots:
     void noPool();
     void rootLevelPool();
     void stackAllocatedPool();
-    void heapAllocatedPool();
 };
 
 static id lastDeallocedObject = nil;
@@ -61,26 +62,6 @@ void tst_QMacAutoreleasePool::stackAllocatedPool()
     [pool drain];
 }
 
-void tst_QMacAutoreleasePool::heapAllocatedPool()
-{
-    // The special case, a pool allocated on the heap, or as a member of a
-    // heap allocated object. This is not a supported use of QMacAutoReleasePool,
-    // and will result in warnings if the pool is prematurely drained.
-
-    NSObject *allocedObject = nil;
-    {
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-        QMacAutoReleasePool *qtPool = nullptr;
-        {
-            qtPool = new QMacAutoReleasePool;
-            allocedObject = [[[DeallocTracker alloc] init] autorelease];
-        }
-        [pool drain];
-        delete qtPool;
-    }
-    QCOMPARE(lastDeallocedObject, allocedObject);
-}
-
 QTEST_APPLESS_MAIN(tst_QMacAutoreleasePool)
 
 #include "tst_qmacautoreleasepool.moc"