diff options
Diffstat (limited to 'src')
21 files changed, 37 insertions, 15 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8f1cd4c684..c55b6ee754 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 54bbbc1e39..9e272e834c 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 ddf8961fe2..a969b4d332 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 70d405fc7b..2c16a67ffa 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 39b3aa2458..7fbf26cb75 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 a3a25062c5..8f50bc5834 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 b6c2e15ee2..7a73344480 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 1197706397..da77a8432f 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 bb32774d1d..b46583bf84 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 807f502275..38cae4c432 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 9911263c51..2d2a7890d0 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 8a3d259b3e..21fae6de6f 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 341ffb6ffc..7950fc3d66 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 688f0504a6..c526a7a8fb 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 a8778ebe1d..2fcfa46634 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 1ea3505061..eb0621d386 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 86dbc9c3d0..5b77413def 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 dd0f1d6511..25cfa97586 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 15808754ac..5f4fbd9eb8 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 c75609c43c..046a1021af 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 5f4c08a6fd..af4de68701 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> |