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ø <tor.arne.vestbo@qt.io>
2022-08-24 11:15:57 +02:00 · 2022-08-24 11:15:57 +02:00 · b077c419ea
commit b077c419ea
parent 1e8316958a
31 changed files with 56 additions and 15 deletions
--- 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
--- 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
--- 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
--- 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"
--- 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;
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>

--- 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>
--- 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() :
--- 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
--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- 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
--- 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);
--- 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>

--- 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}
 )

--- 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>

--- 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>

--- 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>

--- 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>

--- 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}
 )
--- 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
--- 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()
--- 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
--- 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"