1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Remove APPLE prefix from platform names

Browse Source 
None of the other platforms have it.

Change-Id: Ib448c2c03ba03f711b507ef391977c0e6aa7c192
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-03-16 13:36:47 +01:00
parent db745fdd2d
commit 77885f8402
77 changed files with 188 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -19,7 +19,7 @@ if(NOT QT_BUILD_STANDALONE_TESTS)
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/kwin"
)
if(APPLE_MACOS)
if(MACOS)
# Add module directory to pick up custom Info.plist template
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos")
endif()

4
cmake/FindGLESv2.cmake
View File

@ -54,9 +54,9 @@ find_package_handle_standard_args(GLESv2 DEFAULT_MSG ${package_args})
mark_as_advanced(${package_args})
if(GLESv2_FOUND AND NOT TARGET GLESv2::GLESv2)
if(EMSCRIPTEN OR APPLE_UIKIT)
if(EMSCRIPTEN OR UIKIT)
add_library(GLESv2::GLESv2 INTERFACE IMPORTED)
if(APPLE_UIKIT)
if(UIKIT)
# For simulator_and_device builds we can't specify the full library path, because
# it's specific to either the device or the simulator. Resort to passing a link
# flag instead.

8
cmake/QtBaseGlobalTargets.cmake
View File

@ -95,7 +95,7 @@ list(APPEND init_platform "set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\" CACHE ST
if(APPLE)
# For simulator_and_device build, we should not explicitly set the sysroot.
list(LENGTH CMAKE_OSX_ARCHITECTURES _qt_osx_architectures_count)
if(CMAKE_OSX_SYSROOT AND NOT _qt_osx_architectures_count GREATER 1 AND APPLE_UIKIT)
if(CMAKE_OSX_SYSROOT AND NOT _qt_osx_architectures_count GREATER 1 AND UIKIT)
list(APPEND init_platform "set(CMAKE_OSX_SYSROOT \"${CMAKE_OSX_SYSROOT}\" CACHE PATH \"\")")
endif()
unset(_qt_osx_architectures_count)
@ -105,7 +105,7 @@ if(APPLE)
"set(CMAKE_OSX_DEPLOYMENT_TARGET \"${CMAKE_OSX_DEPLOYMENT_TARGET}\" CACHE STRING \"\")")
endif()
if(APPLE_UIKIT)
if(UIKIT)
list(APPEND init_platform
"set(CMAKE_SYSTEM_NAME \"${CMAKE_SYSTEM_NAME}\" CACHE STRING \"\")")
set(_qt_osx_architectures_escaped "${CMAKE_OSX_ARCHITECTURES}")
@ -177,7 +177,7 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake")
# Do what mkspecs/features/uikit/default_pre.prf does, aka enable sse2 for
# simulator_and_device_builds.
if(APPLE_UIKIT AND NOT QT_UIKIT_SDK)
if(UIKIT AND NOT QT_UIKIT_SDK)
set(__QtFeature_custom_enabled_cache_variables
TEST_subarch_sse2
FEATURE_sse2
@ -267,7 +267,7 @@ qt_copy_or_install(DIRECTORY cmake/
PATTERN "3rdparty" EXCLUDE
)
if(APPLE_MACOS)
if(MACOS)
qt_copy_or_install(FILES
cmake/macos/MacOSXBundleInfo.plist.in
DESTINATION "${__GlobalConfig_install_dir}/macos"

2
cmake/QtCompilerOptimization.cmake
View File

@ -62,7 +62,7 @@ if(GCC OR CLANG)
set(QT_CFLAGS_AVX512VBMI "-mavx512vbmi")
set(QT_CFLAGS_AESNI "-maes")
set(QT_CFLAGS_SHANI "-msha")
if(NOT APPLE_UIKIT AND NOT QT_64BIT)
if(NOT UIKIT AND NOT QT_64BIT)
set(QT_CFLAGS_NEON "-mfpu=neon")
endif()
set(QT_CFLAGS_MIPS_DSP "-mdsp")

2
cmake/QtConfig.cmake.in
View File

@ -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_MACOS)
if(MACOS)
# Add module directory to pick up custom Info.plist template
list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/macos")
endif()

2
cmake/QtFeature.cmake
View File

@ -722,7 +722,7 @@ function(qt_get_platform_try_compile_vars out_var)
endforeach()
# Pass darwin specific options.
if(APPLE_UIKIT)
if(UIKIT)
if(CMAKE_OSX_ARCHITECTURES)
list(GET CMAKE_OSX_ARCHITECTURES 0 osx_first_arch)

6
cmake/QtInternalTargets.cmake
View File

@ -99,13 +99,13 @@ endif()
target_compile_definitions(PlatformCommonInternal INTERFACE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
if(APPLE_MACOS)
if(MACOS)
target_compile_definitions(PlatformCommonInternal INTERFACE GL_SILENCE_DEPRECATION)
elseif(APPLE_UIKIT)
elseif(UIKIT)
target_compile_definitions(PlatformCommonInternal INTERFACE GLES_SILENCE_DEPRECATION)
endif()
if(APPLE_UIKIT)
if(UIKIT)
# Do what mkspecs/features/uikit/default_pre.prf does, aka enable sse2 for
# simulator_and_device_builds.
if(FEATURE_simulator_and_device)

10
cmake/QtPlatformSupport.cmake
View File

@ -22,11 +22,11 @@ qt_set01(BSD APPLE OR OPENBSD OR FREEBSD OR NETBSD)
qt_set01(WINRT WIN32 AND CMAKE_VS_PLATFORM_TOOSLET STREQUAL "winrt") # FIXME: How to identify this?
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_MACOS APPLE AND NOT APPLE_UIKIT)
qt_set01(IOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS")
qt_set01(TVOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "tvOS")
qt_set01(WATCHOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "watchOS")
qt_set01(UIKIT APPLE AND (IOS OR TVOS OR WATCHOS))
qt_set01(MACOS APPLE AND NOT UIKIT)
qt_set01(GCC CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
qt_set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang")

4
cmake/QtSetup.cmake
View File

@ -93,7 +93,7 @@ if(FEATURE_developer_build)
# Tests are not built by default with qmake for iOS and friends, and thus the overall build
# tends to fail. Disable them by default when targeting uikit.
if(APPLE_UIKIT OR ANDROID)
if(UIKIT OR ANDROID)
set(QT_BUILD_TESTING OFF)
endif()
@ -129,7 +129,7 @@ enable_testing()
set(QT_BUILD_EXAMPLES ON)
# Examples are not built by default with qmake for iOS and friends, and thus the overall build
# tends to fail. Disable them by default when targeting uikit.
if(APPLE_UIKIT OR ANDROID)
if(UIKIT OR ANDROID)
set(QT_BUILD_EXAMPLES OFF)
endif()

12
configure.cmake
View File

@ -318,7 +318,7 @@ qt_feature("android-style-assets" PRIVATE
)
qt_feature("shared" PUBLIC
LABEL "Building shared libraries"
AUTODETECT NOT APPLE_UIKIT
AUTODETECT NOT UIKIT
CONDITION BUILD_SHARED_LIBS
)
qt_feature_config("shared" QMAKE_PUBLIC_QT_CONFIG)
@ -380,11 +380,11 @@ qt_feature_config("separate_debug_info" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("appstore-compliant" PUBLIC
LABEL "App store compliance"
PURPOSE "Disables code that is not allowed in platform app stores"
AUTODETECT APPLE_UIKIT OR ANDROID OR WINRT
AUTODETECT UIKIT OR ANDROID OR WINRT
)
qt_feature("simulator_and_device" PUBLIC
LABEL "Build for both simulator and device"
CONDITION APPLE_UIKIT AND NOT QT_UIKIT_SDK
CONDITION UIKIT AND NOT QT_UIKIT_SDK
)
qt_feature_config("simulator_and_device" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("force_asserts" PUBLIC
@ -685,7 +685,7 @@ qt_feature("concurrent" PUBLIC
qt_feature_definition("concurrent" "QT_NO_CONCURRENT" NEGATE VALUE "1")
qt_feature("dbus" PUBLIC PRIVATE
LABEL "Qt D-Bus"
AUTODETECT NOT APPLE_UIKIT AND NOT ANDROID AND NOT WINRT
AUTODETECT NOT UIKIT AND NOT ANDROID AND NOT WINRT
CONDITION QT_FEATURE_thread
)
qt_feature_definition("dbus" "QT_NO_DBUS" NEGATE VALUE "1")
@ -712,7 +712,7 @@ qt_feature("testlib" PRIVATE
)
qt_feature("widgets" PRIVATE
LABEL "Qt Widgets"
AUTODETECT NOT APPLE_TVOS AND NOT APPLE_WATCHOS
AUTODETECT NOT TVOS AND NOT WATCHOS
CONDITION QT_FEATURE_gui
)
qt_feature_definition("widgets" "QT_NO_WIDGETS" NEGATE)
@ -868,7 +868,7 @@ qt_configure_add_report_entry(
qt_configure_add_report_entry(
TYPE ERROR
MESSAGE "Debug build wihtout Release build is not currently supported on ios see QTBUG-71990. Use -debug-and-release."
CONDITION APPLE_IOS AND QT_FEATURE_debug AND NOT QT_FEATURE_debug_and_release
CONDITION IOS AND QT_FEATURE_debug AND NOT QT_FEATURE_debug_and_release
)
qt_configure_add_report_entry(
TYPE WARNING

2
examples/widgets/CMakeLists.txt
View File

@ -28,6 +28,6 @@ if(QT_FEATURE_cursor) # special case
add_subdirectory(mainwindows)
endif()
if(APPLE_MACOS)
if(MACOS)
add_subdirectory(mac)
endif()

2
examples/widgets/mac/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Generated from mac.pro.
if(APPLE_MACOS)
if(MACOS)
add_subdirectory(qmaccocoaviewcontainer)
add_subdirectory(qmacnativewidget)
endif()

2
qmake/.prev_CMakeLists.txt
View File

@ -162,7 +162,7 @@ qt_extend_target(qmake CONDITION UNIX
qlocale_unix.cpp-NOTFOUND
)
qt_extend_target(qmake CONDITION APPLE_MACOS
qt_extend_target(qmake CONDITION MACOS
SOURCES
qcore_foundation.mm
qcore_mac.cpp

2
qmake/CMakeLists.txt
View File

@ -165,7 +165,7 @@ qt_extend_target(qmake CONDITION UNIX
../src/corelib/text/qlocale_unix.cpp
)
qt_extend_target(qmake CONDITION APPLE_MACOS
qt_extend_target(qmake CONDITION MACOS
SOURCES
../src/corelib/kernel/qcore_foundation.mm # special case
../src/corelib/kernel/qcore_mac.cpp # special case

4
src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt vendored
View File

@ -158,13 +158,13 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
HAVE_OT
)
qt_extend_target(BundledHarfbuzz CONDITION APPLE_UIKIT
qt_extend_target(BundledHarfbuzz CONDITION UIKIT
LIBRARIES
${FWCoreGraphics}
${FWCoreText}
)
qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT APPLE_UIKIT
qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT UIKIT
LIBRARIES
${FWApplicationServices}
)

6
src/3rdparty/harfbuzz-ng/CMakeLists.txt vendored
View File

@ -159,13 +159,13 @@ qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case
HAVE_OT
)
qt_extend_target(BundledHarfbuzz CONDITION APPLE_UIKIT
qt_extend_target(BundledHarfbuzz CONDITION UIKIT
LIBRARIES
${FWCoreGraphics}
${FWCoreText}
)
qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT APPLE_UIKIT
qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT UIKIT
LIBRARIES
${FWApplicationServices}
)
@ -175,4 +175,4 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains
src/hb-fallback-shape.cc
DEFINES
HAVE_FALLBACK
)
)

2
src/3rdparty/pcre2/CMakeLists.txt vendored
View File

@ -56,7 +56,7 @@ qt_extend_target(BundledPcre2 CONDITION WIN32
PCRE2_STATIC
)
qt_extend_target(BundledPcre2 CONDITION APPLE_UIKIT OR QNX OR WINRT
qt_extend_target(BundledPcre2 CONDITION UIKIT OR QNX OR WINRT
DEFINES
PCRE2_DISABLE_JIT
)

20
src/corelib/.prev_CMakeLists.txt
View File

@ -398,7 +398,7 @@ qt_extend_target(Core CONDITION APPLE
${FWFoundation}
)
qt_extend_target(Core CONDITION APPLE_MACOS
qt_extend_target(Core CONDITION 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_MACOS OR NOT ICC)
qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT 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_MACOS AND NOT QT_FEATURE_icu
qt_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu
SOURCES
text/qcollator_macx.cpp
)
qt_extend_target(Core CONDITION UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_icu
qt_extend_target(Core CONDITION UNIX AND NOT 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_MACOS AND QT_FEATURE_filesystemwatcher
qt_extend_target(Core CONDITION 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_MACOS
qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS
SOURCES
io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h
)
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)
qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT 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_MACOS
qt_extend_target(Core CONDITION APPLE AND NOT MACOS
PUBLIC_LIBRARIES
${FWMobileCoreServices}
)
@ -946,12 +946,12 @@ qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
${CMAKE_DL_LIBS}
)
qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS)
qt_extend_target(Core CONDITION APPLE AND (IOS OR TVOS)
LIBRARIES
${FWUIKit}
)
qt_extend_target(Core CONDITION APPLE_WATCHOS
qt_extend_target(Core CONDITION WATCHOS
LIBRARIES
${FWWatchKit}
)

20
src/corelib/CMakeLists.txt
View File

@ -508,7 +508,7 @@ qt_extend_target(Core CONDITION APPLE
${FWFoundation}
)
qt_extend_target(Core CONDITION APPLE_MACOS
qt_extend_target(Core CONDITION 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_MACOS OR NOT ICC)
qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT 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_MACOS AND NOT QT_FEATURE_icu
qt_extend_target(Core CONDITION MACOS AND NOT QT_FEATURE_icu
SOURCES
text/qcollator_macx.cpp
)
qt_extend_target(Core CONDITION UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_icu
qt_extend_target(Core CONDITION UNIX AND NOT 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_MACOS AND QT_FEATURE_filesystemwatcher
qt_extend_target(Core CONDITION 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_MACOS
qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS
SOURCES
io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h
)
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)
qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT 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_MACOS
qt_extend_target(Core CONDITION APPLE AND NOT MACOS
PUBLIC_LIBRARIES
${FWMobileCoreServices}
)
@ -1049,12 +1049,12 @@ qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
${CMAKE_DL_LIBS}
)
qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS)
qt_extend_target(Core CONDITION APPLE AND (IOS OR TVOS)
LIBRARIES
${FWUIKit}
)
qt_extend_target(Core CONDITION APPLE_WATCHOS
qt_extend_target(Core CONDITION WATCHOS
LIBRARIES
${FWWatchKit}
)

2
src/corelib/configure.cmake
View File

@ -782,7 +782,7 @@ qt_feature("process" PUBLIC
SECTION "File I/O"
LABEL "QProcess"
PURPOSE "Supports external process invocation."
CONDITION QT_FEATURE_processenvironment AND ( QT_FEATURE_thread OR NOT UNIX ) AND NOT WINRT AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT VXWORKS AND NOT rtems
CONDITION QT_FEATURE_processenvironment AND ( QT_FEATURE_thread OR NOT UNIX ) AND NOT WINRT AND NOT UIKIT AND NOT INTEGRITY AND NOT VXWORKS AND NOT rtems
)
qt_feature_definition("process" "QT_NO_PROCESS" NEGATE VALUE "1")
qt_feature("processenvironment" PUBLIC

8
src/gui/.prev_CMakeLists.txt
View File

@ -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_MACOS
qt_extend_target(Gui CONDITION MACOS
LIBRARIES
${FWAppKit}
PUBLIC_LIBRARIES
@ -517,12 +517,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_cssparser
text/qcssparser.cpp text/qcssparser_p.h
)
qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
DEFINES
ENABLE_PIXMAN_DRAWHELPERS
)
if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64"))
if(UNIX AND NOT ANDROID AND NOT UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64"))
qt_add_simd_part(Gui SIMD neon
SOURCES
../3rdparty/pixman/pixman-arm-neon-asm.S
@ -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_MACOS
qt_extend_target(Gui CONDITION IOS OR MACOS
SOURCES
rhi/qrhimetal.mm rhi/qrhimetal_p.h
rhi/qrhimetal_p_p.h

16
src/gui/CMakeLists.txt
View File

@ -18,11 +18,11 @@ if (QT_FEATURE_gui)
set(_default_platform "windows")
elseif(ANDROID)
set(_default_platform "android")
elseif(APPLE_MACOS)
elseif(MACOS)
set(_default_platform "cocoa")
elseif(APPLE_TVOS OR APPLE_IOS)
elseif(TVOS OR IOS)
set(_default_platform "ios")
elseif(APPLE_WATCHOS)
elseif(WATCHOS)
set(_default_platform "minimal")
elseif(QNX)
set(_default_platform "qnx")
@ -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_MACOS
qt_extend_target(Gui CONDITION MACOS
LIBRARIES
${FWAppKit}
PUBLIC_LIBRARIES
@ -578,7 +578,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz
# Replicate what src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro does, which is link CoreText
# when targeting uikit.
qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz AND APPLE_UIKIT
qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz AND UIKIT
LIBRARIES
${FWCoreText}
)
@ -622,12 +622,12 @@ qt_extend_target(Gui CONDITION QT_FEATURE_cssparser
text/qcssparser.cpp text/qcssparser_p.h
)
qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
DEFINES
ENABLE_PIXMAN_DRAWHELPERS
)
if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64"))
if(UNIX AND NOT ANDROID AND NOT UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64"))
qt_add_simd_part(Gui SIMD neon
SOURCES
../3rdparty/pixman/pixman-arm-neon-asm.S
@ -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_MACOS
qt_extend_target(Gui CONDITION IOS OR MACOS
SOURCES
rhi/qrhimetal.mm rhi/qrhimetal_p.h
rhi/qrhimetal_p_p.h

6
src/gui/configure.cmake
View File

@ -706,7 +706,7 @@ qt_feature("mtdev" PRIVATE
)
qt_feature("opengles2" PUBLIC
LABEL "OpenGL ES 2.0"
CONDITION NOT WIN32 AND ( NOT APPLE_WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )
CONDITION NOT WIN32 AND ( NOT WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )
ENABLE INPUT_opengl STREQUAL 'es2' OR INPUT_angle STREQUAL 'yes'
DISABLE INPUT_opengl STREQUAL 'desktop' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no'
)
@ -730,7 +730,7 @@ qt_feature("opengles32" PUBLIC
qt_feature_definition("opengles32" "QT_OPENGL_ES_3_2")
qt_feature("opengl-desktop"
LABEL "Desktop OpenGL"
CONDITION ( WIN32 AND NOT WINRT AND NOT QT_FEATURE_opengles2 AND ( MSVC OR OpenGL_OpenGL_FOUND ) ) OR ( NOT APPLE_WATCHOS AND NOT WIN32 AND NOT WASM AND OpenGL_OpenGL_FOUND )
CONDITION ( WIN32 AND NOT WINRT AND NOT QT_FEATURE_opengles2 AND ( MSVC OR OpenGL_OpenGL_FOUND ) ) OR ( NOT WATCHOS AND NOT WIN32 AND NOT WASM AND OpenGL_OpenGL_FOUND )
ENABLE INPUT_opengl STREQUAL 'desktop'
DISABLE INPUT_opengl STREQUAL 'es2' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no'
)
@ -1279,7 +1279,7 @@ qt_configure_add_report_entry(
qt_configure_add_report_entry(
TYPE ERROR
MESSAGE "The OpenGL functionality tests failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform."
CONDITION QT_FEATURE_gui AND NOT APPLE_WATCHOS AND ( NOT INPUT_opengl STREQUAL 'no' ) AND NOT QT_FEATURE_opengl_desktop AND NOT QT_FEATURE_opengles2 AND NOT QT_FEATURE_opengl_dynamic
CONDITION QT_FEATURE_gui AND NOT WATCHOS AND ( NOT INPUT_opengl STREQUAL 'no' ) AND NOT QT_FEATURE_opengl_desktop AND NOT QT_FEATURE_opengles2 AND NOT QT_FEATURE_opengl_dynamic
)
qt_configure_add_report_entry(
TYPE WARNING

16
src/network/.prev_CMakeLists.txt
View File

@ -231,25 +231,25 @@ qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT
kernel/qdnslookup_winrt.cpp
)
qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT
qt_extend_target(Network CONDITION APPLE AND NOT UIKIT
LIBRARIES
${FWCoreServices}
${FWSystemConfiguration}
)
qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_MACOS
qt_extend_target(Network CONDITION IOS OR MACOS
SOURCES
kernel/qnetconmonitor_darwin.mm
LIBRARIES
${FWSystemConfiguration}
)
qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_MACOS
qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS
SOURCES
kernel/qnetconmonitor_win.cpp
)
qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_MACOS AND NOT QT_FEATURE_netlistmgr
qt_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr
SOURCES
kernel/qnetconmonitor_stub.cpp
)
@ -259,17 +259,17 @@ qt_extend_target(Network CONDITION QT_FEATURE_gssapi
GSSAPI::GSSAPI
)
qt_extend_target(Network CONDITION APPLE_UIKIT
qt_extend_target(Network CONDITION UIKIT
SOURCES
kernel/qnetworkinterface_uikit_p.h
)
qt_extend_target(Network CONDITION APPLE_MACOS
qt_extend_target(Network CONDITION MACOS
SOURCES
kernel/qnetworkproxy_mac.cpp
)
qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_MACOS AND (UNIX OR WINRT)
qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT 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_MACOS AND (
PkgConfig::Libproxy
)
qt_extend_target(Network CONDITION NOT APPLE_MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
qt_extend_target(Network CONDITION NOT MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
SOURCES
kernel/qnetworkproxy_generic.cpp
)

16
src/network/CMakeLists.txt
View File

@ -231,25 +231,25 @@ qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT
kernel/qdnslookup_winrt.cpp
)
qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT
qt_extend_target(Network CONDITION APPLE AND NOT UIKIT
LIBRARIES
${FWCoreServices}
${FWSystemConfiguration}
)
qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_MACOS
qt_extend_target(Network CONDITION IOS OR MACOS
SOURCES
kernel/qnetconmonitor_darwin.mm
LIBRARIES
${FWSystemConfiguration}
)
qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_MACOS
qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS
SOURCES
kernel/qnetconmonitor_win.cpp
)
qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_MACOS AND NOT QT_FEATURE_netlistmgr
qt_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr
SOURCES
kernel/qnetconmonitor_stub.cpp
)
@ -259,17 +259,17 @@ qt_extend_target(Network CONDITION QT_FEATURE_gssapi
GSSAPI::GSSAPI
)
qt_extend_target(Network CONDITION APPLE_UIKIT
qt_extend_target(Network CONDITION UIKIT
SOURCES
kernel/qnetworkinterface_uikit_p.h
)
qt_extend_target(Network CONDITION APPLE_MACOS
qt_extend_target(Network CONDITION MACOS
SOURCES
kernel/qnetworkproxy_mac.cpp
)
qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_MACOS AND (UNIX OR WINRT)
qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT 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_MACOS AND (
PkgConfig::Libproxy
)
qt_extend_target(Network CONDITION NOT APPLE_MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
qt_extend_target(Network CONDITION NOT MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
SOURCES
kernel/qnetworkproxy_generic.cpp
)

2
src/platformsupport/CMakeLists.txt
View File

@ -16,7 +16,7 @@ endif()
if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib)
add_subdirectory(input)
endif()
if(QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT))
if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
add_subdirectory(services)
endif()
if(QT_FEATURE_opengl)

2
src/platformsupport/clipboard/CMakeLists.txt
View File

@ -23,7 +23,7 @@ qt_add_module(ClipboardSupport
## Scopes:
#####################################################################
qt_extend_target(ClipboardSupport CONDITION APPLE_MACOS
qt_extend_target(ClipboardSupport CONDITION MACOS
LIBRARIES
${FWAppKit}
)

4
src/platformsupport/fontdatabases/.prev_CMakeLists.txt
View File

@ -33,12 +33,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE
${FWFoundation}
)
qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS
qt_extend_target(FontDatabaseSupport CONDITION MACOS
LIBRARIES
${FWAppKit}
)
qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS
qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT MACOS
LIBRARIES
${FWUIKit}
)

4
src/platformsupport/fontdatabases/CMakeLists.txt
View File

@ -36,12 +36,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE
${FWFoundation}
)
qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS
qt_extend_target(FontDatabaseSupport CONDITION MACOS
LIBRARIES
${FWAppKit}
)
qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS
qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT MACOS
LIBRARIES
${FWUIKit}
)

6
src/platformsupport/themes/CMakeLists.txt
View File

@ -22,12 +22,12 @@ qt_add_module(ThemeSupport
## Scopes:
#####################################################################
qt_extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT)
qt_extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT UIKIT)
SOURCES
genericunix/qgenericunixthemes.cpp genericunix/qgenericunixthemes_p.h
)
qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT UIKIT)
SOURCES
genericunix/dbusmenu/qdbusmenuadaptor.cpp genericunix/dbusmenu/qdbusmenuadaptor_p.h
genericunix/dbusmenu/qdbusmenubar.cpp genericunix/dbusmenu/qdbusmenubar_p.h
@ -41,7 +41,7 @@ qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR U
Qt::DBus
)
qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT UIKIT)
SOURCES
genericunix/dbustray/qdbustrayicon.cpp genericunix/dbustray/qdbustrayicon_p.h
genericunix/dbustray/qdbustraytypes.cpp genericunix/dbustray/qdbustraytypes_p.h

2
src/plugins/platforminputcontexts/CMakeLists.txt
View File

@ -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_MACOS)
if(QT_FEATURE_xkbcommon AND TARGET Qt::DBus AND UNIX AND NOT MACOS)
add_subdirectory(ibus)
endif()

4
src/plugins/platforms/.prev_CMakeLists.txt
View File

@ -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)

4
src/plugins/platforms/CMakeLists.txt
View File

@ -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

2
src/plugins/platforms/ios/.prev_CMakeLists.txt
View File

@ -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

2
src/plugins/platforms/ios/CMakeLists.txt
View File

@ -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

2
src/plugins/platforms/ios/optional/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# Generated from optional.pro.
if(APPLE_IOS)
if(IOS)
add_subdirectory(nsphotolibrarysupport)
endif()

2
src/plugins/printsupport/.prev_CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Generated from printsupport.pro.
if(APPLE_MACOS)
if(MACOS)
add_subdirectory(cocoa)
endif()
if(WIN32)

2
src/plugins/printsupport/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Generated from printsupport.pro.
if(APPLE_MACOS)
if(MACOS)
add_subdirectory(cocoa)
endif()
if(WIN32)

2
src/printsupport/CMakeLists.txt
View File

@ -143,7 +143,7 @@ if(QT_FEATURE_printdialog)
)
endif()
qt_extend_target(PrintSupport CONDITION APPLE_MACOS AND QT_FEATURE_printdialog
qt_extend_target(PrintSupport CONDITION MACOS AND QT_FEATURE_printdialog
SOURCES
dialogs/qpagesetupdialog_mac.mm
dialogs/qprintdialog_mac.mm

2
src/printsupport/configure.cmake
View File

@ -32,7 +32,7 @@ qt_feature("printer" PUBLIC
SECTION "Painting"
LABEL "QPrinter"
PURPOSE "Provides a printer backend of QPainter."
CONDITION NOT APPLE_UIKIT AND NOT WINRT AND QT_FEATURE_picture AND QT_FEATURE_temporaryfile AND QT_FEATURE_pdf
CONDITION NOT UIKIT AND NOT WINRT AND QT_FEATURE_picture AND QT_FEATURE_temporaryfile AND QT_FEATURE_pdf
)
qt_feature_definition("printer" "QT_NO_PRINTER" NEGATE VALUE "1")
qt_feature("printpreviewwidget" PUBLIC

2
src/testlib/.prev_CMakeLists.txt
View File

@ -101,7 +101,7 @@ qt_extend_target(Test CONDITION APPLE
${FWSecurity}
)
qt_extend_target(Test CONDITION APPLE_MACOS
qt_extend_target(Test CONDITION MACOS
SOURCES
qtestutil_macos.mm qtestutil_macos_p.h
PUBLIC_LIBRARIES

6
src/testlib/CMakeLists.txt
View File

@ -99,7 +99,7 @@ qt_extend_target(Test CONDITION APPLE
${FWSecurity}
)
qt_extend_target(Test CONDITION APPLE_MACOS
qt_extend_target(Test CONDITION MACOS
SOURCES
qtestutil_macos.mm qtestutil_macos_p.h
PUBLIC_LIBRARIES
@ -111,8 +111,8 @@ qt_extend_target(Test CONDITION APPLE_MACOS
# special case begin
# Do not bother with disabled stuff:
# 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) ...
# extend_target(Test CONDITION (MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ...
# extend_target(Test CONDITION ((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:

6
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -174,19 +174,19 @@ qt_extend_target(Bootstrap CONDITION APPLE
${FWFoundation}
)
qt_extend_target(Bootstrap CONDITION APPLE_MACOS
qt_extend_target(Bootstrap CONDITION MACOS
SOURCES
../../corelib/io/qstandardpaths_mac.mm
LIBRARIES
${FWCoreServices}
)
qt_extend_target(Bootstrap CONDITION APPLE_UIKIT
qt_extend_target(Bootstrap CONDITION UIKIT
LIBRARIES
${FWUIKit}
)
qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_MACOS
qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
SOURCES
../../corelib/io/qstandardpaths_unix.cpp
)

6
src/tools/bootstrap/CMakeLists.txt
View File

@ -174,19 +174,19 @@ qt_extend_target(Bootstrap CONDITION APPLE
${FWFoundation}
)
qt_extend_target(Bootstrap CONDITION APPLE_MACOS
qt_extend_target(Bootstrap CONDITION MACOS
SOURCES
../../corelib/io/qstandardpaths_mac.mm
LIBRARIES
${FWCoreServices}
)
qt_extend_target(Bootstrap CONDITION APPLE_UIKIT
qt_extend_target(Bootstrap CONDITION UIKIT
LIBRARIES
${FWUIKit}
)
qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_MACOS
qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
SOURCES
../../corelib/io/qstandardpaths_unix.cpp
)

4
src/widgets/.prev_CMakeLists.txt
View File

@ -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
)

4
src/widgets/CMakeLists.txt
View File

@ -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
)

2
src/widgets/configure.cmake
View File

@ -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"

2
tests/auto/CMakeLists.txt
View File

@ -31,7 +31,7 @@ endif()
# special case begin
# Build only corelib and gui tests when targeting uikit (iOS),
# because the script can't handle the SUBDIRS assignment well.
if (APPLE_UIKIT)
if (UIKIT)
return()
endif()
# special case end

2
tests/auto/corelib/.prev_CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Generated from corelib.pro.
add_subdirectory(kernel)
if(NOT APPLE_UIKIT)
if(NOT UIKIT)
add_subdirectory(animation)
add_subdirectory(codecs)
add_subdirectory(global)

2
tests/auto/corelib/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Generated from corelib.pro.
add_subdirectory(kernel)
if(NOT APPLE_UIKIT)
if(NOT UIKIT)
add_subdirectory(animation)
add_subdirectory(codecs)
add_subdirectory(global)

2
tests/auto/corelib/io/qdir/CMakeLists.txt
View File

@ -37,7 +37,7 @@ add_qt_resource(tst_qdir "qdir"
## Scopes:
#####################################################################
#### Keys ignored in scope 2:.:.:qdir.pro:APPLE_IOS:
#### Keys ignored in scope 2:.:.:qdir.pro:IOS:
# QMAKE_INFO_PLIST = "Info.plist"
extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata

6
tests/auto/corelib/kernel/.prev_CMakeLists.txt
View File

@ -17,11 +17,11 @@ add_subdirectory(qmetaenum)
if(TARGET Qt::Gui)
add_subdirectory(qmimedata)
endif()
if(TARGET Qt::Network AND NOT ANDROID AND NOT APPLE_UIKIT)
if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT)
add_subdirectory(qobject)
endif()
add_subdirectory(qpointer)
if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT APPLE_UIKIT)
if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT UIKIT)
add_subdirectory(qsharedmemory)
endif()
add_subdirectory(qsignalblocker)
@ -29,7 +29,7 @@ add_subdirectory(qsignalmapper)
if(QT_FEATURE_private_tests AND TARGET Qt::Network)
add_subdirectory(qsocketnotifier)
endif()
if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT APPLE_UIKIT)
if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT UIKIT)
add_subdirectory(qsystemsemaphore)
endif()
add_subdirectory(qtimer)

6
tests/auto/corelib/kernel/CMakeLists.txt
View File

@ -17,11 +17,11 @@ add_subdirectory(qmetaenum)
if(TARGET Qt::Gui)
add_subdirectory(qmimedata)
endif()
if(TARGET Qt::Network AND NOT ANDROID AND NOT APPLE_UIKIT)
if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT)
# add_subdirectory(qobject) # special case
endif()
add_subdirectory(qpointer)
if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT APPLE_UIKIT)
if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT UIKIT)
add_subdirectory(qsharedmemory)
endif()
add_subdirectory(qsignalblocker)
@ -29,7 +29,7 @@ add_subdirectory(qsignalmapper)
if(QT_FEATURE_private_tests AND TARGET Qt::Network)
add_subdirectory(qsocketnotifier)
endif()
if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT APPLE_UIKIT)
if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT UIKIT)
add_subdirectory(qsystemsemaphore)
endif()
# add_subdirectory(qtimer) # special case

2
tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_subdirectory(tst)
if(UNIX AND NOT ANDROID AND NOT APPLE)
add_subdirectory(almostplugin)
endif()
if(APPLE_MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui)
if(MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui)
add_subdirectory(machtest)
endif()

6
tests/auto/gui/.prev_CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Generated from gui.pro.
add_subdirectory(kernel)
if(NOT APPLE_UIKIT)
if(NOT UIKIT)
add_subdirectory(image)
add_subdirectory(math3d)
add_subdirectory(painting)
@ -10,10 +10,10 @@ if(NOT APPLE_UIKIT)
add_subdirectory(itemmodels)
add_subdirectory(rhi)
endif()
if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT)
if(QT_FEATURE_opengl AND NOT UIKIT AND NOT WINRT)
add_subdirectory(qopenglconfig)
add_subdirectory(qopengl)
endif()
if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT)
if(QT_FEATURE_vulkan AND NOT UIKIT)
add_subdirectory(qvulkan)
endif()

6
tests/auto/gui/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Generated from gui.pro.
add_subdirectory(kernel)
if(NOT APPLE_UIKIT)
if(NOT UIKIT)
add_subdirectory(image)
add_subdirectory(math3d)
add_subdirectory(painting)
@ -10,10 +10,10 @@ if(NOT APPLE_UIKIT)
add_subdirectory(itemmodels)
add_subdirectory(rhi)
endif()
if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT)
if(QT_FEATURE_opengl AND NOT UIKIT AND NOT WINRT)
add_subdirectory(qopenglconfig)
add_subdirectory(qopengl)
endif()
if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT)
if(QT_FEATURE_vulkan AND NOT UIKIT)
add_subdirectory(qvulkan)
endif()

2
tests/auto/gui/kernel/CMakeLists.txt
View File

@ -20,7 +20,7 @@ add_subdirectory(qwindow)
add_subdirectory(qguiapplication)
add_subdirectory(qpixelformat)
add_subdirectory(qrasterwindow)
if(NOT ANDROID AND NOT APPLE_UIKIT)
if(NOT ANDROID AND NOT UIKIT)
add_subdirectory(qclipboard)
endif()
if(TARGET Qt::Network)

2
tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
View File

@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard
## Scopes:
#####################################################################
extend_target(tst_qclipboard CONDITION APPLE_MACOS
extend_target(tst_qclipboard CONDITION MACOS
PUBLIC_LIBRARIES
${FWAppKit}
)

2
tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
View File

@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard
## Scopes:
#####################################################################
extend_target(tst_qclipboard CONDITION APPLE_MACOS
extend_target(tst_qclipboard CONDITION MACOS
PUBLIC_LIBRARIES
${FWAppKit}
)

2
tests/auto/network/kernel/CMakeLists.txt
View File

@ -13,7 +13,7 @@ endif()
if(QT_FEATURE_private_tests)
add_subdirectory(qauthenticator)
if(NOT APPLE_MACOS)
if(NOT MACOS)
add_subdirectory(qhostinfo)
endif()
endif()

4
tests/auto/other/CMakeLists.txt
View File

@ -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_MACOS AND TARGET Qt::Gui AND TARGET Qt::Widgets)
if(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_MACOS AND TARGET Qt::Gui)
if(MACOS AND TARGET Qt::Gui)
add_subdirectory(macnativeevents)
endif()
if(embedded)

2
tests/auto/other/macgui/.prev_CMakeLists.txt
View File

@ -26,7 +26,7 @@ add_qt_test(tst_macgui
## Scopes:
#####################################################################
extend_target(tst_macgui CONDITION APPLE_MACOS
extend_target(tst_macgui CONDITION MACOS
PUBLIC_LIBRARIES
${FWApplicationServices}
)

2
tests/auto/other/macgui/CMakeLists.txt
View File

@ -26,7 +26,7 @@ add_qt_test(tst_macgui
## Scopes:
#####################################################################
extend_target(tst_macgui CONDITION APPLE_MACOS
extend_target(tst_macgui CONDITION MACOS
PUBLIC_LIBRARIES
${FWApplicationServices}
)

2
tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
View File

@ -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_MACOS:
#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:MACOS:
# testcase.timeout = "900"

4
tests/auto/widgets/styles/CMakeLists.txt
View File

@ -1,10 +1,10 @@
# Generated from styles.pro.
if (APPLE_MACOS)
if (MACOS)
add_subdirectory(qmacstyle)
endif()
add_subdirectory(qstyle)
if (NOT APPLE_UIKIT AND NOT ANDROID AND NOT QNX)
if (NOT UIKIT AND NOT ANDROID AND NOT QNX)
add_subdirectory(qstyleoption)
endif()
if (QT_FEATURE_private_tests)

2
tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
View File

@ -19,7 +19,7 @@ add_qt_test(tst_qlineedit
## Scopes:
#####################################################################
extend_target(tst_qlineedit CONDITION APPLE_MACOS
extend_target(tst_qlineedit CONDITION MACOS
PUBLIC_LIBRARIES
${FWAppKit}
)

4
tests/auto/widgets/widgets/qmenu/CMakeLists.txt
View File

@ -17,14 +17,14 @@ add_qt_test(tst_qmenu
## Scopes:
#####################################################################
extend_target(tst_qmenu CONDITION APPLE_MACOS
extend_target(tst_qmenu CONDITION MACOS
SOURCES
tst_qmenu_mac.mm
PUBLIC_LIBRARIES
objc
)
extend_target(tst_qmenu CONDITION NOT APPLE_MACOS
extend_target(tst_qmenu CONDITION NOT MACOS
DEFINES
QTEST_QPA_MOUSE_HANDLING
)

2
tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
View File

@ -16,7 +16,7 @@ add_qt_test(tst_qmenubar
## Scopes:
#####################################################################
extend_target(tst_qmenubar CONDITION APPLE_MACOS
extend_target(tst_qmenubar CONDITION MACOS
SOURCES
tst_qmenubar_mac.mm
PUBLIC_LIBRARIES

2
tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
View File

@ -19,7 +19,7 @@ add_qt_test(tst_qplaintextedit
## Scopes:
#####################################################################
extend_target(tst_qplaintextedit CONDITION APPLE_MACOS
extend_target(tst_qplaintextedit CONDITION MACOS
PUBLIC_LIBRARIES
${FWAppKit}
)

2
tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
View File

@ -22,7 +22,7 @@ add_qt_test(tst_qtextedit
## Scopes:
#####################################################################
extend_target(tst_qtextedit CONDITION APPLE_MACOS
extend_target(tst_qtextedit CONDITION MACOS
PUBLIC_LIBRARIES
${FWAppKit}
)

2
tests/manual/CMakeLists.txt
View File

@ -2,7 +2,7 @@
# special case begn
# Don't build manual tests when targeting iOS.
if(APPLE_UIKIT)
if(UIKIT)
return()
endif()
# special case end

2
util/cmake/condition_simplifier.py
View File

@ -106,7 +106,7 @@ def _recursive_simplify(expr):
# Simplify even further, based on domain knowledge:
# windowses = ('WIN32', 'WINRT')
apples = ("APPLE_MACOS", "APPLE_UIKIT", "APPLE_IOS", "APPLE_TVOS", "APPLE_WATCHOS")
apples = ("MACOS", "UIKIT", "IOS", "TVOS", "WATCHOS")
bsds = ("FREEBSD", "OPENBSD", "NETBSD")
androids = ("ANDROID", "ANDROID_EMBEDDED")
unixes = (

4
util/cmake/configurejson2cmake.py
View File

@ -807,9 +807,9 @@ def get_feature_mapping():
# special case to disable implicit feature on WIN32, until ANGLE is ported
"opengl-dynamic": {"autoDetect": "OFF"},
"opengles2": { # special case to disable implicit feature on WIN32, until ANGLE is ported
"condition": "NOT WIN32 AND ( NOT APPLE_WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )"
"condition": "NOT WIN32 AND ( NOT WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )"
},
"simulator_and_device": {"condition": "APPLE_UIKIT AND NOT QT_UIKIT_SDK"},
"simulator_and_device": {"condition": "UIKIT AND NOT QT_UIKIT_SDK"},
"pkg-config": None,
"posix_fallocate": None, # Only needed for sqlite, which we do not want to build
"posix-libiconv": {

16
util/cmake/helper.py
View File

@ -657,9 +657,9 @@ platform_mapping = {
"nacl": "NACL",
"android": "ANDROID",
"android-embedded": "ANDROID_EMBEDDED",
"uikit": "APPLE_UIKIT",
"tvos": "APPLE_TVOS",
"watchos": "APPLE_WATCHOS",
"uikit": "UIKIT",
"tvos": "TVOS",
"watchos": "WATCHOS",
"winrt": "WINRT",
"wasm": "WASM",
"emscripten": "EMSCRIPTEN",
@ -668,17 +668,17 @@ platform_mapping = {
"gcc": "GCC",
"icc": "ICC",
"intel_icc": "ICC",
"osx": "APPLE_MACOS",
"ios": "APPLE_IOS",
"osx": "MACOS",
"ios": "IOS",
"freebsd": "FREEBSD",
"openbsd": "OPENBSD",
"netbsd": "NETBSD",
"haiku": "HAIKU",
"netbsd": "NETBSD",
"mac": "APPLE",
"macx": "APPLE_MACOS",
"macos": "APPLE_MACOS",
"macx-icc": "(APPLE_MACOS AND ICC)",
"macx": "MACOS",
"macos": "MACOS",
"macx-icc": "(MACOS AND ICC)",
}

2
util/cmake/pro2cmake.py
View File

@ -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_MACOS", condition)
condition = re.sub(r"CONFIG\(osx\)", r"MACOS", condition)
def gcc_version_handler(match_obj: Match):
operator = match_obj.group(1)

24
util/cmake/tests/test_logic_mapping.py
View File

@ -116,42 +116,42 @@ def test_simplify_unix_and_win32_or_foobar_or_barfoo():
def test_simplify_watchos_and_win32():
validate_simplify('APPLE_WATCHOS AND WIN32', 'OFF')
validate_simplify('WATCHOS AND WIN32', 'OFF')
def test_simplify_win32_and_watchos():
validate_simplify('WIN32 AND APPLE_WATCHOS', 'OFF')
validate_simplify('WIN32 AND WATCHOS', 'OFF')
def test_simplify_apple_and_appleosx():
validate_simplify('APPLE AND APPLE_MACOS', 'APPLE_MACOS')
validate_simplify('APPLE AND MACOS', 'MACOS')
def test_simplify_apple_or_appleosx():
validate_simplify('APPLE OR APPLE_MACOS', 'APPLE')
validate_simplify('APPLE OR MACOS', 'APPLE')
def test_simplify_apple_or_appleosx_level1():
validate_simplify('foobar AND (APPLE OR APPLE_MACOS )', 'APPLE AND foobar')
validate_simplify('foobar AND (APPLE OR MACOS )', 'APPLE AND foobar')
def test_simplify_apple_or_appleosx_level1_double():
validate_simplify('foobar AND (APPLE OR APPLE_MACOS )', 'APPLE AND foobar')
validate_simplify('foobar AND (APPLE OR MACOS )', 'APPLE AND foobar')
def test_simplify_apple_or_appleosx_level1_double_with_extra_spaces():
validate_simplify('foobar AND (APPLE OR APPLE_MACOS ) '
'AND ( APPLE_MACOS OR APPLE )', 'APPLE AND foobar')
validate_simplify('foobar AND (APPLE OR MACOS ) '
'AND ( MACOS OR APPLE )', 'APPLE AND foobar')
def test_simplify_apple_or_appleosx_level2():
validate_simplify('foobar AND ( ( APPLE OR APPLE_WATCHOS ) '
'OR APPLE_MACOS ) AND ( APPLE_MACOS OR APPLE ) '
validate_simplify('foobar AND ( ( APPLE OR WATCHOS ) '
'OR MACOS ) AND ( 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_MACOS', 'OFF')
validate_simplify('NOT APPLE AND 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_MACOS',
validate_simplify('ANDROID AND NOT ANDROID_EMBEDDED AND NOT MACOS',
'ANDROID AND NOT ANDROID_EMBEDDED')

10
util/cmake/tests/test_scope_handling.py
View File

@ -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_MACOS', SOURCES='qsp_mac.mm')
scope7 = _new_scope(parent_scope=scope6, condition='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_MACOS'
assert scope8.total_condition == 'UNIX AND NOT APPLE_MACOS'
assert scope7.total_condition == 'MACOS'
assert scope8.total_condition == 'UNIX AND NOT MACOS'
assert scope9.total_condition == 'ANDROID AND NOT ANDROID_EMBEDDED'
assert scope10.total_condition == 'UNIX AND NOT APPLE_MACOS AND (ANDROID_EMBEDDED OR NOT ANDROID)'
assert scope10.total_condition == 'UNIX AND NOT 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_MACOS AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)'
assert scope12.total_condition == 'UNIX AND NOT MACOS AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)'
def test_recursive_expansion():
scope = _new_scope(A='Foo',B='$$A/Bar')