Move QMacAutoReleasePool from qglobal.h to qcore_mac_p.h

And include qcore_mac_p.h where needed.

Task-number: QTBUG-99313
Change-Id: Idb1b005f1b5938e8cf329ae06ffaf0d249874db2
Reviewed-by: Tor Arne Vestbø <[email protected]>

31 files changed, 56 insertions, 15 deletions

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 8f1cd4c684c..c55b6ee754b 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -63,21 +63,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOEXCEPT;
 
 #if defined(__cplusplus)
 
-#ifdef Q_OS_DARWIN
-
-// Implemented in qcore_mac_objc.mm
-class Q_CORE_EXPORT QMacAutoReleasePool
-{
-public:
-    QMacAutoReleasePool();
-    ~QMacAutoReleasePool();
-private:
-    Q_DISABLE_COPY(QMacAutoReleasePool)
-    void *pool;
-};
-
-#endif // Q_OS_DARWIN
-
 #if 0
 #pragma qt_class(QFunctionPointer)
 #endif
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index 54bbbc1e395..9e272e834cb 100644
--- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h
@@ -109,6 +109,15 @@ protected:
     T value;
 };
 
+class Q_CORE_EXPORT QMacAutoReleasePool
+{
+public:
+    QMacAutoReleasePool();
+    ~QMacAutoReleasePool();
+private:
+    Q_DISABLE_COPY(QMacAutoReleasePool)
+    void *pool;
+};
 
 #ifdef Q_OS_MACOS
 class QMacRootLevelAutoReleasePool
diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm
index ddf8961fe26..a969b4d3327 100644
--- a/src/gui/rhi/qrhimetal.mm
+++ b/src/gui/rhi/qrhimetal.mm
@@ -6,6 +6,8 @@
 #include <QWindow>
 #include <qmath.h>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #ifdef Q_OS_MACOS
 #include <AppKit/AppKit.h>
 #else
diff --git a/src/gui/text/coretext/qcoretextfontdatabase.mm b/src/gui/text/coretext/qcoretextfontdatabase.mm
index 70d405fc7b0..2c16a67ffa0 100644
--- a/src/gui/text/coretext/qcoretextfontdatabase.mm
+++ b/src/gui/text/coretext/qcoretextfontdatabase.mm
@@ -13,6 +13,7 @@
 #endif
 
 #include <QtCore/qelapsedtimer.h>
+#include <QtCore/private/qcore_mac_p.h>
 
 #include "qcoretextfontdatabase_p.h"
 #include "qfontengine_coretext_p.h"
diff --git a/src/plugins/platforms/cocoa/main.mm b/src/plugins/platforms/cocoa/main.mm
index 39b3aa2458f..7fbf26cb758 100644
--- a/src/plugins/platforms/cocoa/main.mm
+++ b/src/plugins/platforms/cocoa/main.mm
@@ -8,6 +8,8 @@
 #include "qcocoaintegration.h"
 #include "qcocoatheme.h"
 
+#include <QtCore/private/qcore_mac_p.h>
+
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index a3a25062c57..8f50bc5834a 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -9,6 +9,7 @@
 #include "qcocoahelpers.h"
 
 #include <QtCore/qmath.h>
+#include <QtCore/private/qcore_mac_p.h>
 #include <QtGui/qpainter.h>
 
 #include <QuartzCore/CATransaction.h>
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index b6c2e15ee2c..7a73344480a 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -8,6 +8,7 @@
 #include "qcocoahelpers.h"
 #include <QtGui/private/qcoregraphics_p.h>
 #include <QtCore/qsysinfo.h>
+#include <QtCore/private/qcore_mac_p.h>
 
 #include <vector>
 
diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
index 11977063974..da77a8432ff 100644
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
@@ -49,6 +49,7 @@
 #include <QtCore/qscopeguard.h>
 #include <QtCore/qsocketnotifier.h>
 #include <QtCore/private/qthread_p.h>
+#include <QtCore/private/qcore_mac_p.h>
 
 #include <qpa/qplatformwindow.h>
 #include <qpa/qplatformnativeinterface.h>
diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
index bb32774d1d3..b46583bf840 100644
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
@@ -18,6 +18,7 @@
 #include <QtCore/qoperatingsystemversion.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qregularexpression.h>
+#include <QtCore/private/qcore_mac_p.h>
 
 #include <QtGui/qguiapplication.h>
 #include <QtGui/private/qguiapplication_p.h>
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
index 807f502275f..38cae4c4324 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
@@ -8,6 +8,8 @@
 #include "qcocoahelpers.h"
 #include "qcocoascreen.h"
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include <qdebug.h>
 #include <dlfcn.h>
 
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 9911263c51c..2d2a7890d03 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -30,6 +30,7 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/qpointingdevice.h>
 
+#include <QtCore/private/qcore_mac_p.h>
 #include <QtGui/private/qcoregraphics_p.h>
 #include <QtGui/private/qopenglcontext_p.h>
 #include <QtGui/private/qrhibackingstore_p.h>
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm
index 8a3d259b3e3..21fae6de6f3 100644
--- a/src/plugins/platforms/cocoa/qcocoamenu.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenu.mm
@@ -18,6 +18,8 @@
 #include "qcocoascreen.h"
 #include "qcocoaapplicationdelegate.h"
 
+#include <QtCore/private/qcore_mac_p.h>
+
 QT_BEGIN_NAMESPACE
 
 QCocoaMenu::QCocoaMenu() :
diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm
index 341ffb6ffc7..7950fc3d66d 100644
--- a/src/plugins/platforms/cocoa/qcocoamenubar.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm
@@ -13,6 +13,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDebug>
 
+#include <QtCore/private/qcore_mac_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
index 688f0504a60..c526a7a8fb3 100644
--- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
@@ -16,6 +16,7 @@
 #include "qcocoamenuloader.h"
 #include <QtGui/private/qcoregraphics_p.h>
 #include <QtCore/qregularexpression.h>
+#include <QtCore/private/qcore_mac_p.h>
 #include <QtGui/private/qapplekeymapper_p.h>
 
 #include <QtCore/QDebug>
diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm
index a8778ebe1de..2fcfa466344 100644
--- a/src/plugins/platforms/cocoa/qcocoascreen.mm
+++ b/src/plugins/platforms/cocoa/qcocoascreen.mm
@@ -16,6 +16,7 @@
 
 #include <QtGui/private/qwindow_p.h>
 
+#include <QtCore/private/qcore_mac_p.h>
 #include <QtCore/private/qeventdispatcher_cf_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm
index 1ea35050617..eb0621d386e 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -15,6 +15,7 @@
 #include "qcocoahelpers.h"
 
 #include <QtCore/qfileinfo.h>
+#include <QtCore/private/qcore_mac_p.h>
 #include <QtGui/private/qfont_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qcoregraphics_p.h>
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.mm b/src/plugins/platforms/cocoa/qmacclipboard.mm
index 86dbc9c3d0b..5b77413def1 100644
--- a/src/plugins/platforms/cocoa/qmacclipboard.mm
+++ b/src/plugins/platforms/cocoa/qmacclipboard.mm
@@ -9,6 +9,7 @@
 #include <QtGui/qbitmap.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
+#include <QtCore/private/qcore_mac_p.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qevent.h>
 #include <QtCore/qurl.h>
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index dd0f1d65118..25cfa97586e 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -21,6 +21,7 @@
 #include <QtCore/QPointer>
 #include <QtCore/QSet>
 #include <QtCore/qsysinfo.h>
+#include <QtCore/private/qcore_mac_p.h>
 #include <QtGui/QAccessible>
 #include <QtGui/QImage>
 #include <private/qguiapplication_p.h>
diff --git a/src/plugins/styles/mac/main.mm b/src/plugins/styles/mac/main.mm
index 15808754aca..5f4fbd9eb8e 100644
--- a/src/plugins/styles/mac/main.mm
+++ b/src/plugins/styles/mac/main.mm
@@ -4,6 +4,8 @@
 #include <QtWidgets/qstyleplugin.h>
 #include "qmacstyle_mac_p.h"
 
+#include <QtCore/private/qcore_mac_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QMacStylePlugin : public QStylePlugin
diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
index c75609c43c5..046a1021af3 100644
--- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm
+++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
@@ -13,6 +13,8 @@
 
 #include <QtPrintSupport/private/qprintengine_mac_p.h>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 QT_USE_NAMESPACE
 
 @class QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate);
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 5f4c08a6fd2..af4de687010 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -80,6 +80,10 @@
 
 #include <qtwidgets_tracepoints_p.h>
 
+#ifdef Q_OS_MACOS
+#include <QtCore/private/qcore_mac_p.h>
+#endif
+
 #include <algorithm>
 #include <iterator>
 
diff --git a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
index ab28fb5f2f5..1e1e820b14b 100644
--- a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
@@ -17,6 +17,7 @@ qt_internal_extend_target(tst_quuid CONDITION APPLE
     SOURCES
         ../tst_quuid_darwin.mm
     LIBRARIES
+        Qt::CorePrivate
         ${FWFoundation}
 )
 
diff --git a/tests/auto/corelib/plugin/quuid/tst_quuid_darwin.mm b/tests/auto/corelib/plugin/quuid/tst_quuid_darwin.mm
index a1f040fb4f8..b8d4f034cf0 100644
--- a/tests/auto/corelib/plugin/quuid/tst_quuid_darwin.mm
+++ b/tests/auto/corelib/plugin/quuid/tst_quuid_darwin.mm
@@ -4,6 +4,8 @@
 #include <QtCore/QUuid>
 #include <QTest>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
 
diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm b/tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm
index e7624898cf0..b900195b0fb 100644
--- a/tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm
+++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm
@@ -5,6 +5,8 @@
 #include <QtCore/QByteArray>
 #include <QTest>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
 
diff --git a/tests/auto/corelib/text/qstring/tst_qstring_mac.mm b/tests/auto/corelib/text/qstring/tst_qstring_mac.mm
index 212187ed1b8..5cdf3a43413 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring_mac.mm
+++ b/tests/auto/corelib/text/qstring/tst_qstring_mac.mm
@@ -4,6 +4,8 @@
 #include <QtCore/QString>
 #include <QTest>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
 
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm b/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm
index 7704f569421..ea8051f22b5 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm
@@ -5,6 +5,8 @@
 #include <QtCore/QDateTime>
 #include <QTest>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
 
diff --git a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
index fb64db8538c..15c89e18fb4 100644
--- a/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
@@ -11,5 +11,6 @@ qt_internal_add_test(tst_qmacautoreleasepool
     SOURCES
         tst_qmacautoreleasepool.mm
     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 dff8b4a3e73..e18d848f871 100644
--- a/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
+++ b/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
@@ -3,6 +3,8 @@
 
 #include <QTest>
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include <Foundation/Foundation.h>
 
 class tst_QMacAutoreleasePool : public QObject
diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog_mac_helpers.mm b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog_mac_helpers.mm
index f035888f6cd..3b38c54d522 100644
--- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog_mac_helpers.mm
+++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog_mac_helpers.mm
@@ -1,6 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include <QtCore/private/qcore_mac_p.h>
+
 #include <AppKit/AppKit.h>
 
 void click_cocoa_button()
diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
index b62093e234e..c80e7152181 100644
--- a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
+++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
@@ -13,6 +13,7 @@ qt_internal_add_manual_test(multiwindow_threaded
         multiwindow_threaded.cpp
         window.cpp window.h
     LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
         Qt::Widgets
diff --git a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
index ef690ca828b..d817c90c69c 100644
--- a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
+++ b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
@@ -38,6 +38,10 @@
 #include <QtGui/private/qrhimetal_p.h>
 #endif
 
+#ifdef Q_OS_DARWIN
+#include <QtCore/private/qcore_mac_p.h>
+#endif
+
 #include "window.h"
 
 #include "../shared/cube.h"