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 --- 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 +- 22 files changed, 57 insertions(+), 57 deletions(-) (limited to 'src') 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" -- cgit v1.2.3