diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-16 13:36:47 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-16 17:57:56 +0100 |
| commit | 77885f8402ad65e00e01c5e15777edcedf9741b2 (patch) | |
| tree | 456874ac9ce27cfb1d4c6100056893620b308529 /src/plugins/platforms | |
| parent | db745fdd2dbd57af54f7da637eef6c892824a6fb (diff) | |
cmake: Remove APPLE prefix from platform names
None of the other platforms have it.
Change-Id: Ib448c2c03ba03f711b507ef391977c0e6aa7c192
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/optional/CMakeLists.txt | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforms/.prev_CMakeLists.txt b/src/plugins/platforms/.prev_CMakeLists.txt index ce9c870454..c58fb31aea 100644 --- a/src/plugins/platforms/.prev_CMakeLists.txt +++ b/src/plugins/platforms/.prev_CMakeLists.txt @@ -12,10 +12,10 @@ endif() if(QT_FEATURE_xcb) add_subdirectory(xcb) endif() -if(APPLE_UIKIT AND NOT APPLE_WATCHOS) +if(UIKIT AND NOT WATCHOS) add_subdirectory(ios) endif() -if(APPLE_MACOS) +if(MACOS) add_subdirectory(cocoa) endif() if(QT_FEATURE_direct3d9 AND WIN32 AND NOT WINRT) diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt index c4796fb7e1..442596286a 100644 --- a/src/plugins/platforms/CMakeLists.txt +++ b/src/plugins/platforms/CMakeLists.txt @@ -12,10 +12,10 @@ endif() if(QT_FEATURE_xcb) add_subdirectory(xcb) endif() -if(APPLE_UIKIT AND NOT APPLE_WATCHOS) +if(UIKIT AND NOT WATCHOS) add_subdirectory(ios) endif() -if(APPLE_MACOS) +if(MACOS) add_subdirectory(cocoa) endif() if(WIN32 AND NOT WINRT) # special case TODO fix direct3d9 test diff --git a/src/plugins/platforms/ios/.prev_CMakeLists.txt b/src/plugins/platforms/ios/.prev_CMakeLists.txt index d7ff160ee0..3a330e2b7b 100644 --- a/src/plugins/platforms/ios/.prev_CMakeLists.txt +++ b/src/plugins/platforms/ios/.prev_CMakeLists.txt @@ -49,7 +49,7 @@ extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSuppo Qt::PlatformCompositorSupportPrivate ) -extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS +extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm qiosfiledialog.h qiosfiledialog.mm diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index d7ff160ee0..3a330e2b7b 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -49,7 +49,7 @@ extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSuppo Qt::PlatformCompositorSupportPrivate ) -extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS +extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm qiosfiledialog.h qiosfiledialog.mm diff --git a/src/plugins/platforms/ios/optional/CMakeLists.txt b/src/plugins/platforms/ios/optional/CMakeLists.txt index 3c84e61f26..6f5d754d4a 100644 --- a/src/plugins/platforms/ios/optional/CMakeLists.txt +++ b/src/plugins/platforms/ios/optional/CMakeLists.txt @@ -1,5 +1,5 @@ # Generated from optional.pro. -if(APPLE_IOS) +if(IOS) add_subdirectory(nsphotolibrarysupport) endif() |