From db745fdd2dbd57af54f7da637eef6c892824a6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 16 Mar 2020 13:37:10 +0100 Subject: cmake: Fix naming when referring to Apple macOS Change-Id: Iafb5e448d0d65d42f788464fc600594a5666f9af Reviewed-by: Alexandru Croitor --- CMakeLists.txt | 2 +- cmake/QtBaseGlobalTargets.cmake | 2 +- cmake/QtConfig.cmake.in | 2 +- cmake/QtInternalTargets.cmake | 2 +- cmake/QtPlatformSupport.cmake | 2 +- examples/widgets/CMakeLists.txt | 2 +- examples/widgets/mac/CMakeLists.txt | 2 +- qmake/.prev_CMakeLists.txt | 2 +- qmake/CMakeLists.txt | 2 +- src/corelib/.prev_CMakeLists.txt | 16 ++++++++-------- src/corelib/CMakeLists.txt | 16 ++++++++-------- src/gui/.prev_CMakeLists.txt | 4 ++-- src/gui/CMakeLists.txt | 6 +++--- src/network/.prev_CMakeLists.txt | 12 ++++++------ src/network/CMakeLists.txt | 12 ++++++------ src/platformsupport/clipboard/CMakeLists.txt | 2 +- src/platformsupport/fontdatabases/.prev_CMakeLists.txt | 4 ++-- src/platformsupport/fontdatabases/CMakeLists.txt | 4 ++-- src/plugins/platforminputcontexts/CMakeLists.txt | 2 +- src/plugins/platforms/.prev_CMakeLists.txt | 2 +- src/plugins/platforms/CMakeLists.txt | 2 +- src/plugins/printsupport/.prev_CMakeLists.txt | 2 +- src/plugins/printsupport/CMakeLists.txt | 2 +- src/printsupport/CMakeLists.txt | 2 +- src/testlib/.prev_CMakeLists.txt | 2 +- src/testlib/CMakeLists.txt | 6 +++--- src/tools/bootstrap/.prev_CMakeLists.txt | 4 ++-- src/tools/bootstrap/CMakeLists.txt | 4 ++-- src/widgets/.prev_CMakeLists.txt | 4 ++-- src/widgets/CMakeLists.txt | 4 ++-- src/widgets/configure.cmake | 2 +- tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt | 2 +- .../gui/kernel/qclipboard/test/.prev_CMakeLists.txt | 2 +- tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt | 2 +- tests/auto/network/kernel/CMakeLists.txt | 2 +- tests/auto/other/CMakeLists.txt | 4 ++-- tests/auto/other/macgui/.prev_CMakeLists.txt | 2 +- tests/auto/other/macgui/CMakeLists.txt | 2 +- .../widgets/dialogs/qfilesystemmodel/CMakeLists.txt | 2 +- tests/auto/widgets/styles/CMakeLists.txt | 2 +- tests/auto/widgets/widgets/qlineedit/CMakeLists.txt | 2 +- tests/auto/widgets/widgets/qmenu/CMakeLists.txt | 4 ++-- tests/auto/widgets/widgets/qmenubar/CMakeLists.txt | 2 +- .../auto/widgets/widgets/qplaintextedit/CMakeLists.txt | 2 +- tests/auto/widgets/widgets/qtextedit/CMakeLists.txt | 2 +- util/cmake/condition_simplifier.py | 2 +- util/cmake/helper.py | 8 ++++---- util/cmake/pro2cmake.py | 2 +- util/cmake/tests/test_logic_mapping.py | 18 +++++++++--------- util/cmake/tests/test_scope_handling.py | 10 +++++----- 50 files changed, 102 insertions(+), 102 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62f12110d0..1c75d75bcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if(NOT QT_BUILD_STANDALONE_TESTS) "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/kwin" ) - if(APPLE_OSX) + if(APPLE_MACOS) # Add module directory to pick up custom Info.plist template list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos") endif() diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 47f9a1afd7..bb937dac05 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -267,7 +267,7 @@ qt_copy_or_install(DIRECTORY cmake/ PATTERN "3rdparty" EXCLUDE ) -if(APPLE_OSX) +if(APPLE_MACOS) qt_copy_or_install(FILES cmake/macos/MacOSXBundleInfo.plist.in DESTINATION "${__GlobalConfig_install_dir}/macos" diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in index e9d2d7f2dc..1d45952502 100644 --- a/cmake/QtConfig.cmake.in +++ b/cmake/QtConfig.cmake.in @@ -34,7 +34,7 @@ list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}") list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/3rdparty/extra-cmake-modules/find-modules") list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/3rdparty/kwin") -if(APPLE_OSX) +if(APPLE_MACOS) # Add module directory to pick up custom Info.plist template list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/macos") endif() diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake index ff42e726dc..5ef2885720 100644 --- a/cmake/QtInternalTargets.cmake +++ b/cmake/QtInternalTargets.cmake @@ -99,7 +99,7 @@ endif() target_compile_definitions(PlatformCommonInternal INTERFACE $<$>:QT_NO_DEBUG>) -if(APPLE_OSX) +if(APPLE_MACOS) target_compile_definitions(PlatformCommonInternal INTERFACE GL_SILENCE_DEPRECATION) elseif(APPLE_UIKIT) target_compile_definitions(PlatformCommonInternal INTERFACE GLES_SILENCE_DEPRECATION) diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake index b54d52eba4..868433a954 100644 --- a/cmake/QtPlatformSupport.cmake +++ b/cmake/QtPlatformSupport.cmake @@ -26,7 +26,7 @@ qt_set01(APPLE_IOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS") qt_set01(APPLE_TVOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "tvOS") qt_set01(APPLE_WATCHOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "watchOS") qt_set01(APPLE_UIKIT APPLE AND (APPLE_IOS OR APPLE_TVOS OR APPLE_WATCHOS)) -qt_set01(APPLE_OSX APPLE AND NOT APPLE_UIKIT) +qt_set01(APPLE_MACOS APPLE AND NOT APPLE_UIKIT) qt_set01(GCC CMAKE_CXX_COMPILER_ID STREQUAL "GNU") qt_set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang") diff --git a/examples/widgets/CMakeLists.txt b/examples/widgets/CMakeLists.txt index 1b18fc8622..811c4f9fb6 100644 --- a/examples/widgets/CMakeLists.txt +++ b/examples/widgets/CMakeLists.txt @@ -28,6 +28,6 @@ if(QT_FEATURE_cursor) # special case add_subdirectory(mainwindows) endif() -if(APPLE_OSX) +if(APPLE_MACOS) add_subdirectory(mac) endif() diff --git a/examples/widgets/mac/CMakeLists.txt b/examples/widgets/mac/CMakeLists.txt index 82038acfae..942ea69475 100644 --- a/examples/widgets/mac/CMakeLists.txt +++ b/examples/widgets/mac/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from mac.pro. -if(APPLE_OSX) +if(APPLE_MACOS) add_subdirectory(qmaccocoaviewcontainer) add_subdirectory(qmacnativewidget) endif() diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 3f30387fd4..90dd2a56e2 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -162,7 +162,7 @@ qt_extend_target(qmake CONDITION UNIX qlocale_unix.cpp-NOTFOUND ) -qt_extend_target(qmake CONDITION APPLE_OSX +qt_extend_target(qmake CONDITION APPLE_MACOS SOURCES qcore_foundation.mm qcore_mac.cpp diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index fb370eda4a..205fcebe27 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -165,7 +165,7 @@ qt_extend_target(qmake CONDITION UNIX ../src/corelib/text/qlocale_unix.cpp ) -qt_extend_target(qmake CONDITION APPLE_OSX +qt_extend_target(qmake CONDITION APPLE_MACOS SOURCES ../src/corelib/kernel/qcore_foundation.mm # special case ../src/corelib/kernel/qcore_mac.cpp # special case diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 8bdc2debd3..7b0fe80ce4 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -398,7 +398,7 @@ qt_extend_target(Core CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Core CONDITION APPLE_OSX +qt_extend_target(Core CONDITION APPLE_MACOS LIBRARIES ${FWAppKit} ${FWApplicationServices} @@ -658,7 +658,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_easingcurve tools/qtimeline.cpp tools/qtimeline.h ) -qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC) +qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_MACOS OR NOT ICC) LIBRARIES m ) @@ -692,12 +692,12 @@ qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu text/qcollator_win.cpp ) -qt_extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION APPLE_MACOS AND NOT QT_FEATURE_icu SOURCES text/qcollator_macx.cpp ) -qt_extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_icu SOURCES text/qcollator_posix.cpp ) @@ -784,17 +784,17 @@ qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h ) -qt_extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher +qt_extend_target(Core CONDITION APPLE_MACOS AND QT_FEATURE_filesystemwatcher SOURCES io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_MACOS SOURCES io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) SOURCES io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h ) @@ -866,7 +866,7 @@ qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment io/qprocess_darwin.mm ) -qt_extend_target(Core CONDITION APPLE AND NOT APPLE_OSX +qt_extend_target(Core CONDITION APPLE AND NOT APPLE_MACOS PUBLIC_LIBRARIES ${FWMobileCoreServices} ) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 783346578b..fa3b1a0f05 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -508,7 +508,7 @@ qt_extend_target(Core CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Core CONDITION APPLE_OSX +qt_extend_target(Core CONDITION APPLE_MACOS LIBRARIES ${FWAppKit} ${FWApplicationServices} @@ -761,7 +761,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_easingcurve tools/qtimeline.cpp tools/qtimeline.h ) -qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC) +qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_MACOS OR NOT ICC) LIBRARIES m ) @@ -795,12 +795,12 @@ qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu text/qcollator_win.cpp ) -qt_extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION APPLE_MACOS AND NOT QT_FEATURE_icu SOURCES text/qcollator_macx.cpp ) -qt_extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu +qt_extend_target(Core CONDITION UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_icu SOURCES text/qcollator_posix.cpp ) @@ -887,17 +887,17 @@ qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32 io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h ) -qt_extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher +qt_extend_target(Core CONDITION APPLE_MACOS AND QT_FEATURE_filesystemwatcher SOURCES io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_MACOS SOURCES io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h ) -qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) +qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD) SOURCES io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h ) @@ -969,7 +969,7 @@ qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment io/qprocess_darwin.mm ) -qt_extend_target(Core CONDITION APPLE AND NOT APPLE_OSX +qt_extend_target(Core CONDITION APPLE AND NOT APPLE_MACOS PUBLIC_LIBRARIES ${FWMobileCoreServices} ) diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index fe6ed3d80a..b8603f1884 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -273,7 +273,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl #### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle: # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE" -qt_extend_target(Gui CONDITION APPLE_OSX +qt_extend_target(Gui CONDITION APPLE_MACOS LIBRARIES ${FWAppKit} PUBLIC_LIBRARIES @@ -633,7 +633,7 @@ qt_extend_target(Gui CONDITION WASM platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) -qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_OSX +qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_MACOS SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal_p_p.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index f89881210b..922f7aae3a 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -18,7 +18,7 @@ if (QT_FEATURE_gui) set(_default_platform "windows") elseif(ANDROID) set(_default_platform "android") - elseif(APPLE_OSX) + elseif(APPLE_MACOS) set(_default_platform "cocoa") elseif(APPLE_TVOS OR APPLE_IOS) set(_default_platform "ios") @@ -359,7 +359,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl #### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle: # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE" -qt_extend_target(Gui CONDITION APPLE_OSX +qt_extend_target(Gui CONDITION APPLE_MACOS LIBRARIES ${FWAppKit} PUBLIC_LIBRARIES @@ -778,7 +778,7 @@ qt_extend_target(Gui CONDITION WASM platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) -qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_OSX +qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_MACOS SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal_p_p.h diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index 8f38d07e93..141c9f96d6 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -237,19 +237,19 @@ qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT ${FWSystemConfiguration} ) -qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX +qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_MACOS SOURCES kernel/qnetconmonitor_darwin.mm LIBRARIES ${FWSystemConfiguration} ) -qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX +qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_MACOS SOURCES kernel/qnetconmonitor_win.cpp ) -qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr +qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_MACOS AND NOT QT_FEATURE_netlistmgr SOURCES kernel/qnetconmonitor_stub.cpp ) @@ -264,12 +264,12 @@ qt_extend_target(Network CONDITION APPLE_UIKIT kernel/qnetworkinterface_uikit_p.h ) -qt_extend_target(Network CONDITION APPLE_OSX +qt_extend_target(Network CONDITION APPLE_MACOS SOURCES kernel/qnetworkproxy_mac.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT) +qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_MACOS AND (UNIX OR WINRT) SOURCES kernel/qnetworkproxy_libproxy.cpp LIBRARIES @@ -277,7 +277,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UN PkgConfig::Libproxy ) -qt_extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) +qt_extend_target(Network CONDITION NOT APPLE_MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) SOURCES kernel/qnetworkproxy_generic.cpp ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index baea85ea99..5735c1551f 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -237,19 +237,19 @@ qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT ${FWSystemConfiguration} ) -qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX +qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_MACOS SOURCES kernel/qnetconmonitor_darwin.mm LIBRARIES ${FWSystemConfiguration} ) -qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX +qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_MACOS SOURCES kernel/qnetconmonitor_win.cpp ) -qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr +qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_MACOS AND NOT QT_FEATURE_netlistmgr SOURCES kernel/qnetconmonitor_stub.cpp ) @@ -264,12 +264,12 @@ qt_extend_target(Network CONDITION APPLE_UIKIT kernel/qnetworkinterface_uikit_p.h ) -qt_extend_target(Network CONDITION APPLE_OSX +qt_extend_target(Network CONDITION APPLE_MACOS SOURCES kernel/qnetworkproxy_mac.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT) +qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_MACOS AND (UNIX OR WINRT) SOURCES kernel/qnetworkproxy_libproxy.cpp LIBRARIES @@ -277,7 +277,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UN PkgConfig::Libproxy ) -qt_extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) +qt_extend_target(Network CONDITION NOT APPLE_MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) SOURCES kernel/qnetworkproxy_generic.cpp ) diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt index 52022903aa..5a54d67d28 100644 --- a/src/platformsupport/clipboard/CMakeLists.txt +++ b/src/platformsupport/clipboard/CMakeLists.txt @@ -23,7 +23,7 @@ qt_add_module(ClipboardSupport ## Scopes: ##################################################################### -qt_extend_target(ClipboardSupport CONDITION APPLE_OSX +qt_extend_target(ClipboardSupport CONDITION APPLE_MACOS LIBRARIES ${FWAppKit} ) diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt index 56cf076bd9..5559b7de5e 100644 --- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt +++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt @@ -33,12 +33,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE ${FWFoundation} ) -qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX +qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS LIBRARIES ${FWAppKit} ) -qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX +qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS LIBRARIES ${FWUIKit} ) diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt index b613d6cf6a..a7824d7275 100644 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ b/src/platformsupport/fontdatabases/CMakeLists.txt @@ -36,12 +36,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE ${FWFoundation} ) -qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX +qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS LIBRARIES ${FWAppKit} ) -qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX +qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS LIBRARIES ${FWUIKit} ) diff --git a/src/plugins/platforminputcontexts/CMakeLists.txt b/src/plugins/platforminputcontexts/CMakeLists.txt index 155f5161f2..77dbe2f567 100644 --- a/src/plugins/platforminputcontexts/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/CMakeLists.txt @@ -3,6 +3,6 @@ if(QT_FEATURE_xkbcommon) add_subdirectory(compose) endif() -if(QT_FEATURE_xkbcommon AND TARGET Qt::DBus AND UNIX AND NOT APPLE_OSX) +if(QT_FEATURE_xkbcommon AND TARGET Qt::DBus AND UNIX AND NOT APPLE_MACOS) add_subdirectory(ibus) endif() diff --git a/src/plugins/platforms/.prev_CMakeLists.txt b/src/plugins/platforms/.prev_CMakeLists.txt index 5797b07233..ce9c870454 100644 --- a/src/plugins/platforms/.prev_CMakeLists.txt +++ b/src/plugins/platforms/.prev_CMakeLists.txt @@ -15,7 +15,7 @@ endif() if(APPLE_UIKIT AND NOT APPLE_WATCHOS) add_subdirectory(ios) endif() -if(APPLE_OSX) +if(APPLE_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 57c3952e4c..c4796fb7e1 100644 --- a/src/plugins/platforms/CMakeLists.txt +++ b/src/plugins/platforms/CMakeLists.txt @@ -15,7 +15,7 @@ endif() if(APPLE_UIKIT AND NOT APPLE_WATCHOS) add_subdirectory(ios) endif() -if(APPLE_OSX) +if(APPLE_MACOS) add_subdirectory(cocoa) endif() if(WIN32 AND NOT WINRT) # special case TODO fix direct3d9 test diff --git a/src/plugins/printsupport/.prev_CMakeLists.txt b/src/plugins/printsupport/.prev_CMakeLists.txt index 5853d82c6a..59b1e8b32a 100644 --- a/src/plugins/printsupport/.prev_CMakeLists.txt +++ b/src/plugins/printsupport/.prev_CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from printsupport.pro. -if(APPLE_OSX) +if(APPLE_MACOS) add_subdirectory(cocoa) endif() if(WIN32) diff --git a/src/plugins/printsupport/CMakeLists.txt b/src/plugins/printsupport/CMakeLists.txt index 22b753f5c0..ae6dae1998 100644 --- a/src/plugins/printsupport/CMakeLists.txt +++ b/src/plugins/printsupport/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from printsupport.pro. -if(APPLE_OSX) +if(APPLE_MACOS) add_subdirectory(cocoa) endif() if(WIN32) diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index c11b9d8b15..6222cbf52f 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -143,7 +143,7 @@ if(QT_FEATURE_printdialog) ) endif() -qt_extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog +qt_extend_target(PrintSupport CONDITION APPLE_MACOS AND QT_FEATURE_printdialog SOURCES dialogs/qpagesetupdialog_mac.mm dialogs/qprintdialog_mac.mm diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt index 8279b0719b..4a8a52f0f0 100644 --- a/src/testlib/.prev_CMakeLists.txt +++ b/src/testlib/.prev_CMakeLists.txt @@ -101,7 +101,7 @@ qt_extend_target(Test CONDITION APPLE ${FWSecurity} ) -qt_extend_target(Test CONDITION APPLE_OSX +qt_extend_target(Test CONDITION APPLE_MACOS SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index 8e2a3caafa..bfc2871f16 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -99,7 +99,7 @@ qt_extend_target(Test CONDITION APPLE ${FWSecurity} ) -qt_extend_target(Test CONDITION APPLE_OSX +qt_extend_target(Test CONDITION APPLE_MACOS SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES @@ -111,8 +111,8 @@ qt_extend_target(Test CONDITION APPLE_OSX # special case begin # Do not bother with disabled stuff: -# extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ... -# extend_target(Test CONDITION ((APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ... +# extend_target(Test CONDITION (APPLE_MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ... +# extend_target(Test CONDITION ((APPLE_MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ... # special case end #### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY: diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index be8c0e22d8..ae413b696c 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -174,7 +174,7 @@ qt_extend_target(Bootstrap CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Bootstrap CONDITION APPLE_OSX +qt_extend_target(Bootstrap CONDITION APPLE_MACOS SOURCES ../../corelib/io/qstandardpaths_mac.mm LIBRARIES @@ -186,7 +186,7 @@ qt_extend_target(Bootstrap CONDITION APPLE_UIKIT ${FWUIKit} ) -qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX +qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_MACOS SOURCES ../../corelib/io/qstandardpaths_unix.cpp ) diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index c9deb2c4f5..23b6c8641c 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -174,7 +174,7 @@ qt_extend_target(Bootstrap CONDITION APPLE ${FWFoundation} ) -qt_extend_target(Bootstrap CONDITION APPLE_OSX +qt_extend_target(Bootstrap CONDITION APPLE_MACOS SOURCES ../../corelib/io/qstandardpaths_mac.mm LIBRARIES @@ -186,7 +186,7 @@ qt_extend_target(Bootstrap CONDITION APPLE_UIKIT ${FWUIKit} ) -qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX +qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_MACOS SOURCES ../../corelib/io/qstandardpaths_unix.cpp ) diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 51e8f8064d..0f63b32506 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_OSX +qt_extend_target(Widgets CONDITION APPLE_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_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar) +qt_extend_target(Widgets CONDITION APPLE_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 b3c015f3db..8486336fab 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_OSX +qt_extend_target(Widgets CONDITION APPLE_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_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar) +qt_extend_target(Widgets CONDITION APPLE_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 88b1f3e650..7235ac9883 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_OSX AND QT_FEATURE_animation + CONDITION APPLE_MACOS AND QT_FEATURE_animation ) qt_feature("style-windows" PRIVATE LABEL "Windows" diff --git a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt index ba7d375e3b..bdee0f0f6c 100644 --- a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt @@ -7,6 +7,6 @@ add_subdirectory(tst) if(UNIX AND NOT ANDROID AND NOT APPLE) add_subdirectory(almostplugin) endif() -if(APPLE_OSX AND QT_FEATURE_private_tests AND TARGET Qt::Gui) +if(APPLE_MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui) add_subdirectory(machtest) endif() diff --git a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt index 620ef96a5b..d75f39da58 100644 --- a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt @@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard ## Scopes: ##################################################################### -extend_target(tst_qclipboard CONDITION APPLE_OSX +extend_target(tst_qclipboard CONDITION APPLE_MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt index 620ef96a5b..d75f39da58 100644 --- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt @@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard ## Scopes: ##################################################################### -extend_target(tst_qclipboard CONDITION APPLE_OSX +extend_target(tst_qclipboard CONDITION APPLE_MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/network/kernel/CMakeLists.txt b/tests/auto/network/kernel/CMakeLists.txt index c1082f60b7..49270d11cb 100644 --- a/tests/auto/network/kernel/CMakeLists.txt +++ b/tests/auto/network/kernel/CMakeLists.txt @@ -13,7 +13,7 @@ endif() if(QT_FEATURE_private_tests) add_subdirectory(qauthenticator) - if(NOT APPLE_OSX) + if(NOT APPLE_MACOS) add_subdirectory(qhostinfo) endif() endif() diff --git a/tests/auto/other/CMakeLists.txt b/tests/auto/other/CMakeLists.txt index e1d3c0e839..2ce438985f 100644 --- a/tests/auto/other/CMakeLists.txt +++ b/tests/auto/other/CMakeLists.txt @@ -15,7 +15,7 @@ if(TARGET Qt::Network AND TARGET Qt::Widgets AND NOT WINRT) add_subdirectory(lancelot) add_subdirectory(qnetworkaccessmanager_and_qprogressdialog) endif() -if(APPLE_OSX AND TARGET Qt::Gui AND TARGET Qt::Widgets) +if(APPLE_MACOS AND TARGET Qt::Gui AND TARGET Qt::Widgets) add_subdirectory(macgui) add_subdirectory(macplist) add_subdirectory(qaccessibilitymac) @@ -35,7 +35,7 @@ endif() if(TARGET Qt::Network AND NOT WINRT) add_subdirectory(networkselftest) endif() -if(APPLE_OSX AND TARGET Qt::Gui) +if(APPLE_MACOS AND TARGET Qt::Gui) add_subdirectory(macnativeevents) endif() if(embedded) diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt index 4923568a89..f0374b644e 100644 --- a/tests/auto/other/macgui/.prev_CMakeLists.txt +++ b/tests/auto/other/macgui/.prev_CMakeLists.txt @@ -26,7 +26,7 @@ add_qt_test(tst_macgui ## Scopes: ##################################################################### -extend_target(tst_macgui CONDITION APPLE_OSX +extend_target(tst_macgui CONDITION APPLE_MACOS PUBLIC_LIBRARIES ${FWApplicationServices} ) diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt index de69c43765..a85b845536 100644 --- a/tests/auto/other/macgui/CMakeLists.txt +++ b/tests/auto/other/macgui/CMakeLists.txt @@ -26,7 +26,7 @@ add_qt_test(tst_macgui ## Scopes: ##################################################################### -extend_target(tst_macgui CONDITION APPLE_OSX +extend_target(tst_macgui CONDITION APPLE_MACOS PUBLIC_LIBRARIES ${FWApplicationServices} ) diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt index 38c0547390..09dbc428ec 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt @@ -23,5 +23,5 @@ add_qt_test(tst_qfilesystemmodel #### Keys ignored in scope 2:.:.:qfilesystemmodel.pro:WIN32: # testcase.timeout = "900" -#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:APPLE_OSX: +#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:APPLE_MACOS: # testcase.timeout = "900" diff --git a/tests/auto/widgets/styles/CMakeLists.txt b/tests/auto/widgets/styles/CMakeLists.txt index 4fc260fe39..73bbbeb4ee 100644 --- a/tests/auto/widgets/styles/CMakeLists.txt +++ b/tests/auto/widgets/styles/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from styles.pro. -if (APPLE_OSX) +if (APPLE_MACOS) add_subdirectory(qmacstyle) endif() add_subdirectory(qstyle) diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt index f95094aa7d..7be44863c6 100644 --- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt @@ -19,7 +19,7 @@ add_qt_test(tst_qlineedit ## Scopes: ##################################################################### -extend_target(tst_qlineedit CONDITION APPLE_OSX +extend_target(tst_qlineedit CONDITION APPLE_MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt index a20fe70492..711d360993 100644 --- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt @@ -17,14 +17,14 @@ add_qt_test(tst_qmenu ## Scopes: ##################################################################### -extend_target(tst_qmenu CONDITION APPLE_OSX +extend_target(tst_qmenu CONDITION APPLE_MACOS SOURCES tst_qmenu_mac.mm PUBLIC_LIBRARIES objc ) -extend_target(tst_qmenu CONDITION NOT APPLE_OSX +extend_target(tst_qmenu CONDITION NOT APPLE_MACOS DEFINES QTEST_QPA_MOUSE_HANDLING ) diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt index 43875cd113..0bfb6ac12d 100644 --- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt @@ -16,7 +16,7 @@ add_qt_test(tst_qmenubar ## Scopes: ##################################################################### -extend_target(tst_qmenubar CONDITION APPLE_OSX +extend_target(tst_qmenubar CONDITION APPLE_MACOS SOURCES tst_qmenubar_mac.mm PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt index 4106de04de..6e3ffec498 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt @@ -19,7 +19,7 @@ add_qt_test(tst_qplaintextedit ## Scopes: ##################################################################### -extend_target(tst_qplaintextedit CONDITION APPLE_OSX +extend_target(tst_qplaintextedit CONDITION APPLE_MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt index 61641707b9..4a67320a31 100644 --- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt @@ -22,7 +22,7 @@ add_qt_test(tst_qtextedit ## Scopes: ##################################################################### -extend_target(tst_qtextedit CONDITION APPLE_OSX +extend_target(tst_qtextedit CONDITION APPLE_MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/util/cmake/condition_simplifier.py b/util/cmake/condition_simplifier.py index d02e70e489..13686df1eb 100644 --- a/util/cmake/condition_simplifier.py +++ b/util/cmake/condition_simplifier.py @@ -106,7 +106,7 @@ def _recursive_simplify(expr): # Simplify even further, based on domain knowledge: # windowses = ('WIN32', 'WINRT') - apples = ("APPLE_OSX", "APPLE_UIKIT", "APPLE_IOS", "APPLE_TVOS", "APPLE_WATCHOS") + apples = ("APPLE_MACOS", "APPLE_UIKIT", "APPLE_IOS", "APPLE_TVOS", "APPLE_WATCHOS") bsds = ("FREEBSD", "OPENBSD", "NETBSD") androids = ("ANDROID", "ANDROID_EMBEDDED") unixes = ( diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 9f88e23f97..606aa337e9 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -668,7 +668,7 @@ platform_mapping = { "gcc": "GCC", "icc": "ICC", "intel_icc": "ICC", - "osx": "APPLE_OSX", + "osx": "APPLE_MACOS", "ios": "APPLE_IOS", "freebsd": "FREEBSD", "openbsd": "OPENBSD", @@ -676,9 +676,9 @@ platform_mapping = { "haiku": "HAIKU", "netbsd": "NETBSD", "mac": "APPLE", - "macx": "APPLE_OSX", - "macos": "APPLE_OSX", - "macx-icc": "(APPLE_OSX AND ICC)", + "macx": "APPLE_MACOS", + "macos": "APPLE_MACOS", + "macx-icc": "(APPLE_MACOS AND ICC)", } diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 6010120e45..ac6008f7dc 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1444,7 +1444,7 @@ def map_condition(condition: str) -> str: condition = re.sub(r"^no-png$", r"NOT QT_FEATURE_png", condition) condition = re.sub(r"contains\(CONFIG, static\)", r"NOT QT_BUILD_SHARED_LIBS", condition) condition = re.sub(r"contains\(QT_CONFIG,\w*shared\)", r"QT_BUILD_SHARED_LIBS", condition) - condition = re.sub(r"CONFIG\(osx\)", r"APPLE_OSX", condition) + condition = re.sub(r"CONFIG\(osx\)", r"APPLE_MACOS", condition) def gcc_version_handler(match_obj: Match): operator = match_obj.group(1) diff --git a/util/cmake/tests/test_logic_mapping.py b/util/cmake/tests/test_logic_mapping.py index c18c3ddc65..96feb3e615 100755 --- a/util/cmake/tests/test_logic_mapping.py +++ b/util/cmake/tests/test_logic_mapping.py @@ -124,34 +124,34 @@ def test_simplify_win32_and_watchos(): def test_simplify_apple_and_appleosx(): - validate_simplify('APPLE AND APPLE_OSX', 'APPLE_OSX') + validate_simplify('APPLE AND APPLE_MACOS', 'APPLE_MACOS') def test_simplify_apple_or_appleosx(): - validate_simplify('APPLE OR APPLE_OSX', 'APPLE') + validate_simplify('APPLE OR APPLE_MACOS', 'APPLE') def test_simplify_apple_or_appleosx_level1(): - validate_simplify('foobar AND (APPLE OR APPLE_OSX )', 'APPLE AND foobar') + validate_simplify('foobar AND (APPLE OR APPLE_MACOS )', 'APPLE AND foobar') def test_simplify_apple_or_appleosx_level1_double(): - validate_simplify('foobar AND (APPLE OR APPLE_OSX )', 'APPLE AND foobar') + validate_simplify('foobar AND (APPLE OR APPLE_MACOS )', 'APPLE AND foobar') def test_simplify_apple_or_appleosx_level1_double_with_extra_spaces(): - validate_simplify('foobar AND (APPLE OR APPLE_OSX ) ' - 'AND ( APPLE_OSX OR APPLE )', 'APPLE AND foobar') + validate_simplify('foobar AND (APPLE OR APPLE_MACOS ) ' + 'AND ( APPLE_MACOS OR APPLE )', 'APPLE AND foobar') def test_simplify_apple_or_appleosx_level2(): validate_simplify('foobar AND ( ( APPLE OR APPLE_WATCHOS ) ' - 'OR APPLE_OSX ) AND ( APPLE_OSX OR APPLE ) ' + 'OR APPLE_MACOS ) AND ( APPLE_MACOS OR APPLE ) ' 'AND ( (WIN32 OR WINRT) OR UNIX) ', 'APPLE AND foobar') def test_simplify_not_apple_and_appleosx(): - validate_simplify('NOT APPLE AND APPLE_OSX', 'OFF') + validate_simplify('NOT APPLE AND APPLE_MACOS', 'OFF') def test_simplify_unix_and_bar_or_win32(): @@ -182,5 +182,5 @@ def test_simplify_complex_false(): def test_simplify_android_not_apple(): - validate_simplify('ANDROID AND NOT ANDROID_EMBEDDED AND NOT APPLE_OSX', + validate_simplify('ANDROID AND NOT ANDROID_EMBEDDED AND NOT APPLE_MACOS', 'ANDROID AND NOT ANDROID_EMBEDDED') diff --git a/util/cmake/tests/test_scope_handling.py b/util/cmake/tests/test_scope_handling.py index 1db8b2a079..ecb0ae06cf 100755 --- a/util/cmake/tests/test_scope_handling.py +++ b/util/cmake/tests/test_scope_handling.py @@ -305,7 +305,7 @@ def test_qstandardpaths_scopes(): scope6 = _new_scope(parent_scope=scope5, condition='UNIX') # mac { # OBJECTIVE_SOURCES += io/qstandardpaths_mac.mm - scope7 = _new_scope(parent_scope=scope6, condition='APPLE_OSX', SOURCES='qsp_mac.mm') + scope7 = _new_scope(parent_scope=scope6, condition='APPLE_MACOS', SOURCES='qsp_mac.mm') # } else:android:!android-embedded { # SOURCES += io/qstandardpaths_android.cpp scope8 = _new_scope(parent_scope=scope6, condition='else') @@ -330,12 +330,12 @@ def test_qstandardpaths_scopes(): assert scope4.total_condition == 'WINRT' assert scope5.total_condition == 'UNIX' assert scope6.total_condition == 'UNIX' - assert scope7.total_condition == 'APPLE_OSX' - assert scope8.total_condition == 'UNIX AND NOT APPLE_OSX' + assert scope7.total_condition == 'APPLE_MACOS' + assert scope8.total_condition == 'UNIX AND NOT APPLE_MACOS' assert scope9.total_condition == 'ANDROID AND NOT ANDROID_EMBEDDED' - assert scope10.total_condition == 'UNIX AND NOT APPLE_OSX AND (ANDROID_EMBEDDED OR NOT ANDROID)' + assert scope10.total_condition == 'UNIX AND NOT APPLE_MACOS AND (ANDROID_EMBEDDED OR NOT ANDROID)' assert scope11.total_condition == 'HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' - assert scope12.total_condition == 'UNIX AND NOT APPLE_OSX AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' + assert scope12.total_condition == 'UNIX AND NOT APPLE_MACOS AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' def test_recursive_expansion(): scope = _new_scope(A='Foo',B='$$A/Bar') -- cgit v1.2.3