diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-03 15:40:47 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-06 11:52:14 +0200 |
| commit | 8dd6957cd7a1d86714b32b97dffe603a8636848a (patch) | |
| tree | 7793275d713c3341e01bb8dafc3d1ec9af2f58db /src/plugins/platforms/cocoa | |
| parent | 18cfabafa615e42c4af092edca5bb35eced4de5e (diff) | |
Make QtPlatformHeaders a private module
The APIs will be reintroduced as part of the new platform interface
API where appropriate.
Clients that still depend on the platform headers can include it
via QT += platformheaders-private.
Change-Id: Ifbd836d833d19f3cf48cd4f933d7fe754c06d2d9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index ee40e32033..0d2ed167b6 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -58,6 +58,7 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate + Qt::PlatformHeadersPrivate ) # Resources: diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 51d7038950..8180787737 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -64,6 +64,7 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate + Qt::PlatformHeadersPrivate ) # special case begin diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 742038d5cd..e5a45612b8 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -99,7 +99,7 @@ LIBS += -framework AppKit -framework CoreServices -framework Carbon -framework I DEFINES += QT_NO_FOREACH -QT += core-private gui-private +QT += core-private gui-private platformheaders-private CONFIG += no_app_extension_api_only diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index 22bab0886d..426e413a86 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -64,7 +64,7 @@ #include <QtGui/private/qcoregraphics_p.h> -#include <QtPlatformHeaders/qcocoawindowfunctions.h> +#include <QtPlatformHeaders/private/qcocoawindowfunctions_p.h> #if QT_CONFIG(vulkan) #include <MoltenVK/mvk_vulkan.h> |