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/widgets | |
| 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/widgets')
| -rw-r--r-- | src/widgets/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/widgets/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/widgets/configure.cmake | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 0f63b32506..df76fe30c2 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -296,7 +296,7 @@ qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i3 "/BASE:0x65000000" ) -qt_extend_target(Widgets CONDITION APPLE_MACOS +qt_extend_target(Widgets CONDITION MACOS SOURCES kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm @@ -594,7 +594,7 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol widgets/qwidgettextcontrol_p_p.h ) -qt_extend_target(Widgets CONDITION APPLE_MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar) +qt_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar) SOURCES widgets/qmenu_mac.mm ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 8486336fab..f3c04ac4c7 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -298,7 +298,7 @@ qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i3 "/BASE:0x65000000" ) -qt_extend_target(Widgets CONDITION APPLE_MACOS +qt_extend_target(Widgets CONDITION MACOS SOURCES kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm @@ -596,7 +596,7 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol widgets/qwidgettextcontrol_p_p.h ) -qt_extend_target(Widgets CONDITION APPLE_MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar) +qt_extend_target(Widgets CONDITION MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar) SOURCES widgets/qmenu_mac.mm ) diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake index 7235ac9883..9d79ddb788 100644 --- a/src/widgets/configure.cmake +++ b/src/widgets/configure.cmake @@ -25,7 +25,7 @@ qt_feature("style-fusion" PRIVATE ) qt_feature("style-mac" PRIVATE LABEL "macOS" - CONDITION APPLE_MACOS AND QT_FEATURE_animation + CONDITION MACOS AND QT_FEATURE_animation ) qt_feature("style-windows" PRIVATE LABEL "Windows" |