diff options
Diffstat (limited to 'mkspecs/features')
75 files changed, 628 insertions, 6081 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 6990417536..87fdd763e4 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -1,8 +1,10 @@ APK_PATH = $$shell_path($$OUT_PWD/android-build/$${TARGET}.apk) +TARGET_FOR_ANDROID_DEPLOYMENT_SETTINGS = $$TARGET + !contains(TEMPLATE, subdirs): { apk_install_target.target = apk_install_target apk_install_target.depends = first - apk_install_target.commands = $(MAKE) -f $(MAKEFILE) INSTALL_ROOT=$$OUT_PWD/android-build install + apk_install_target.commands = $(MAKE) -f $(MAKEFILE) INSTALL_ROOT=$$shell_path($$OUT_PWD/android-build) install qtPrepareTool(ANDROIDDEPLOYQT, androiddeployqt) isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET-deployment-settings.json @@ -21,7 +23,12 @@ APK_PATH = $$shell_path($$OUT_PWD/android-build/$${TARGET}.apk) prepareRecursiveTarget(apk_install_target) } -build_pass { +# Apply Android arch specific settings in the following cases: +# - build_pass == true aka Qt was configured with multi-ABI (2+ arches) +# - single_android_abi == true aka Qt was configuring with a single ABI / arch +# modifications are omitted when building config.tests +# during Qt configuration, by checkking for the presence of single_arch +build_pass|if(single_android_abi:!single_arch) { contains(TEMPLATE, ".*app") { !android_app { !contains(TARGET, ".so") { @@ -35,11 +42,13 @@ build_pass { INSTALLS *= target } } - } else: contains(TEMPLATE, "lib"):!static:!QTDIR_build:android_install { + } else: contains(TEMPLATE, "lib"):!QTDIR_build:android_install { tmpvar = $$str_member($$TARGET, -$$str_size($${QT_ARCH}), -1) !equals(tmpvar, $${QT_ARCH}): TARGET = $${TARGET}_$${QT_ARCH} - target.path = /libs/$$ANDROID_TARGET_ARCH/ - INSTALLS *= target + !static { + target.path = /libs/$$ANDROID_TARGET_ARCH/ + INSTALLS *= target + } } } else { android-build-distclean.commands = \ diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index c97fb9d6ac..8d68defa97 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -1,13 +1,18 @@ -contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { +contains(TEMPLATE, ".*app"):!build_pass { defineReplace(emitString) { - return("\"$$replace(1, \\\\, \\\\)\"") + return("\"$$clean_path($$1)\"") } FILE_CONTENT = "{" FILE_CONTENT += " \"description\": \"This file is generated by qmake to be read by androiddeployqt and should not be modified by hand.\"," FILE_CONTENT += " \"qt\": $$emitString($$[QT_INSTALL_PREFIX])," + FILE_CONTENT += " \"qtDataDirectory\": $$emitString($$relative_path($$[QT_INSTALL_DATA], $$[QT_INSTALL_PREFIX]))," + FILE_CONTENT += " \"qtLibExecsDirectory\": $$emitString($$relative_path($$[QT_INSTALL_LIBEXECS], $$[QT_INSTALL_PREFIX]))," + FILE_CONTENT += " \"qtLibsDirectory\": $$emitString($$relative_path($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]))," + FILE_CONTENT += " \"qtPluginsDirectory\": $$emitString($$relative_path($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]))," + FILE_CONTENT += " \"qtQmlDirectory\": $$emitString($$relative_path($$[QT_INSTALL_QML], $$[QT_INSTALL_PREFIX]))," # Settings from mkspecs/environment FILE_CONTENT += " \"sdk\": $$emitString($$ANDROID_SDK_ROOT)," @@ -62,12 +67,32 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { !isEmpty(ANDROID_EXTRA_LIBS): \ FILE_CONTENT += " \"android-extra-libs\": $$emitString($$join(ANDROID_EXTRA_LIBS, ","))," - !isEmpty(QML_IMPORT_PATH): \ - FILE_CONTENT += " \"qml-import-paths\": $$emitString($$join(QML_IMPORT_PATH, ","))," + tool_extension = "" + contains(QMAKE_HOST.os, Windows): tool_extension = ".exe" + FILE_CONTENT += " \"rcc-binary\": $$emitString($$[QT_HOST_LIBEXECS]/rcc$${tool_extension})," + + contains(QT_MODULES, qml) { + FILE_CONTENT += " \"qml-importscanner-binary\": $$emitString($$[QT_HOST_LIBEXECS]/qmlimportscanner$${tool_extension})," + + qml_import_paths = $$(QML2_IMPORT_PATH) + qml_import_paths = $$split(qml_import_paths, $$DIRLIST_SEPARATOR) + qml_import_paths += $$QML_IMPORT_PATH + !isEmpty(qml_import_paths) { + FILE_CONTENT += " \"qml-import-paths\": $$emitString($$join(qml_import_paths, ","))," + } + unset(qml_import_paths) + + + isEmpty(QML_ROOT_PATH): \ + QML_ROOT_PATH = $$_PRO_FILE_PWD_ + FILE_CONTENT += " \"qml-root-path\": $$emitString($$QML_ROOT_PATH)," + } else { + FILE_CONTENT += " \"qml-skip-import-scanning\": true," + } + + !isEmpty(ANDROID_APPLICATION_ARGUMENTS): \ + FILE_CONTENT += " \"android-application-arguments\": $$emitString($$ANDROID_APPLICATION_ARGUMENTS)," - isEmpty(QML_ROOT_PATH): \ - QML_ROOT_PATH = $$_PRO_FILE_PWD_ - FILE_CONTENT += " \"qml-root-path\": $$emitString($$QML_ROOT_PATH)," FILE_CONTENT += " \"stdcpp-path\": $$emitString($$ANDROID_STDCPP_PATH)," !isEmpty(RESOURCES)|!isEmpty(QMLCACHE_RESOURCE_FILES) { # Make sure that qmake generated qrc files are accounted for @@ -78,8 +103,14 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { contains(resource, ".*qmake_qmake_immediate\\.qrc$") { # They will be created for each architecture, since they could be different # we need to account for all of them - for (arch, ANDROID_ABIS): \ - rescopy += $$absolute_path("qmake_qmake_immediate.qrc", $$OUT_PWD/$$arch) + qmake_qrc_path = "qmake_qmake_immediate.qrc" + base_out_path = $$OUT_PWD/$$RCC_DIR + multi_android_abi { + for (arch, ANDROID_ABIS): \ + rescopy += $$absolute_path($$qmake_qrc_path, $$base_out_path/$$arch) + } else { + rescopy += $$absolute_path($$qmake_qrc_path, $$base_out_path) + } } else { contains(resource, ".*\\.qrc$"): rescopy += $$absolute_path($$resource, $$_PRO_FILE_PWD_) } @@ -87,10 +118,10 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { FILE_CONTENT += " \"qrcFiles\": $$emitString($$join(rescopy, ","))," } FILE_CONTENT += "" - FILE_CONTENT += " \"application-binary\": $$emitString($$TARGET)" + FILE_CONTENT += " \"application-binary\": $$emitString($$TARGET_FOR_ANDROID_DEPLOYMENT_SETTINGS)" FILE_CONTENT += "}" - isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET-deployment-settings.json + isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET_FOR_ANDROID_DEPLOYMENT_SETTINGS-deployment-settings.json write_file($$ANDROID_DEPLOYMENT_SETTINGS_FILE, FILE_CONTENT)|error() } diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf index eaa2b0c666..2328b728ac 100644 --- a/mkspecs/features/android/default_pre.prf +++ b/mkspecs/features/android/default_pre.prf @@ -36,6 +36,9 @@ QMAKE_CFLAGS += -fno-limit-debug-info QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS +equals(ANDROID_TARGET_ARCH, armeabi-v7a): \ + QMAKE_LINK += -Wl,--exclude-libs,libunwind.a + ANDROID_STDCPP_PATH = $$NDK_LLVM_PATH/sysroot/usr/lib/ # -fstack-protector-strong offers good protection against stack smashing attacks. @@ -73,8 +76,6 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux- else: equals(QT_ARCH, arm64-v8a): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/aarch64-linux-android- else: CROSS_COMPILE = $$NDK_LLVM_PATH/bin/arm-linux-androideabi- -QMAKE_RANLIB = $${CROSS_COMPILE}ranlib -QMAKE_LINK_SHLIB = $$QMAKE_LINK QMAKE_LFLAGS = QMAKE_LIBS_PRIVATE = -llog -lz -lm -ldl -lc diff --git a/mkspecs/features/android/resolve_config.prf b/mkspecs/features/android/resolve_config.prf index f4ccd88e31..5f0c166f84 100644 --- a/mkspecs/features/android/resolve_config.prf +++ b/mkspecs/features/android/resolve_config.prf @@ -7,4 +7,23 @@ load(resolve_config) CONFIG += $$ALL_ABIS build_all addExclusiveBuildsProper($$ALL_ABIS, $$ANDROID_ABIS) unset(ALL_ABIS) + CONFIG += multi_android_abi +} + +# single_arch is set qtConfTest_compile and is a marker that a config test is being built, and +# thus all Android ABI file name modifications should be avoided (prefix / suffix of +# the built binary). +# single_android_abi means ANDROID_ABI only has one value +# multi_android_abi means ANDROID_ABI has more than one value (Qt configured with 2+ arches) +# +# Assign $$ALL_ANDROID_ABIS to ANDROID_ABIS only if ANDROID_ABIS was not provided by the user +# on the qmake command line and Qt was not configured with 2+ arches. +# +# Note that in config.tests, ANDROID_ABIS ends up being empty (due to !single_arch check) regardless +# of how many ABIs Qt is configured with, which in turns causes the 'architectures' field in +# in android-arch-deployment-settings.json be empty. +!equals(TEMPLATE, aux):!host_build:!single_arch:!java:!multi_android_abi:android:isEmpty(ANDROID_ABIS) { + # Needed for the generated deployment-settings.json not to have an empty list + # of architectures. + ANDROID_ABIS = $$ALL_ANDROID_ABIS } diff --git a/mkspecs/features/android/sdk.prf b/mkspecs/features/android/sdk.prf index 463d399a21..252c234e33 100644 --- a/mkspecs/features/android/sdk.prf +++ b/mkspecs/features/android/sdk.prf @@ -1,6 +1,6 @@ API_VERSION_TO_USE = $$(ANDROID_API_VERSION) isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION -isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-28 +isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-33 ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar !exists($$ANDROID_JAR_FILE) { diff --git a/mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in b/mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in deleted file mode 100644 index ec8075f3f7..0000000000 --- a/mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in +++ /dev/null @@ -1,7 +0,0 @@ - -list(APPEND _Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS - $$CMAKE_SOURCE_INCLUDES -) -set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS - $$CMAKE_SOURCE_PRIVATE_INCLUDES -) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in deleted file mode 100644 index db18dbece6..0000000000 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ /dev/null @@ -1,650 +0,0 @@ -if (CMAKE_VERSION VERSION_LESS 3.1.0) - message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") -endif() - -!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) -!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") -!!ELSE -get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) -# Use original install prefix when loaded through a -# cross-prefix symbolic link such as /lib -> /usr/lib. -get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) -get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) -if(_realCurr STREQUAL _realOrig) - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) -else() - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) -endif() -unset(_realOrig) -unset(_realCurr) -unset(_IMPORT_PREFIX) -!!ENDIF -!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) -!!ELSE -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") -!!ENDIF - -!!IF !equals(TEMPLATE, aux) -# For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. -set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") - -set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME}) -!!ENDIF // TEMPLATE != aux - -macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file) - if(NOT EXISTS \"${file}\" ) - message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file - \\\"${file}\\\" -but this file does not exist. Possible reasons include: -* The file was deleted, renamed, or moved to another location. -* An install or uninstall procedure did not complete successfully. -* The installation package was faulty and contained - \\\"${CMAKE_CURRENT_LIST_FILE}\\\" -but not all the files it references. -\") - endif() -endmacro() - -!!IF !isEmpty(CMAKE_STATIC_TYPE) -function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configuration lib_deps link_flags) - set(_lib_deps) - set(_link_flags) - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\") -!!ELSE - set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\") -!!ENDIF - - if(EXISTS \"${prl_file_location}\") - file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\") - - # file(STRINGS) replaces all semicolons read from the file with backslash semicolons. - # We need to do a reverse transformation in CMake. For that we replace all backslash - # semicolons with just semicolons, but due to the qmake substitution feature - # creating this file, we need to double the amount of backslashes, so the final file - # should have three backslashes and one semicolon. - string(REGEX REPLACE \"\\\\\\;\" \";\" _prl_strings \"${_prl_strings}\") - - string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends \"${_prl_strings}\") - string(REGEX REPLACE \"[ \\t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") - set(_search_paths) - set(_fw_search_paths) - set(_framework_flag) - string(REPLACE \"\\$\\$[QT_INSTALL_LIBS]\" \"${_qt5_install_libs}\" _static_depends \"${_static_depends}\") - foreach(_flag ${_static_depends}) - string(REPLACE \"\\\"\" \"\" _flag ${_flag}) - if(_flag MATCHES \"^-framework$\") - # Handle the next flag as framework name - set(_framework_flag 1) - elseif(_flag MATCHES \"^-F(.*)$\") - # Handle -F/foo/bar flags by recording the framework search paths to be used - # by find_library. - list(APPEND _fw_search_paths \"${CMAKE_MATCH_1}\") - elseif(_framework_flag OR _flag MATCHES \"^-l(.*)$\") - if(_framework_flag) - # Handle Darwin framework bundles passed as -framework Foo - set(_lib ${_flag}) - else() - # Handle normal libraries passed as -lfoo - set(_lib \"${CMAKE_MATCH_1}\") - foreach(_standard_library ${_standard_libraries}) - if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\") - set(_lib_is_default_linked TRUE) - break() - endif() - endforeach() - endif() - if (_lib_is_default_linked) - unset(_lib_is_default_linked) - elseif(_lib MATCHES \"^pthread$\") - find_package(Threads REQUIRED) - list(APPEND _lib_deps Threads::Threads) - else() - set(current_search_paths \"${_search_paths}\") - if(_framework_flag) - set(current_search_paths \"${_fw_search_paths}\") - endif() - if(current_search_paths) - find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib} HINTS ${current_search_paths} NO_DEFAULT_PATH) - endif() - find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib} HINTS ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}) - mark_as_advanced(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH) - if(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH) - list(APPEND _lib_deps - ${_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH} - ) - else() - message(FATAL_ERROR \"Library not found: ${_lib}\") - endif() - unset(_framework_flag) - endif() - elseif(EXISTS \"${_flag}\") - # The flag is an absolute path to an existing library - list(APPEND _lib_deps \"${_flag}\") - elseif(_flag MATCHES \"^-L(.*)$\") - # Handle -Lfoo flags by putting their paths in the search path used by find_library above - list(APPEND _search_paths \"${CMAKE_MATCH_1}\") - else() - # Handle all remaining flags by simply passing them to the linker - list(APPEND _link_flags ${_flag}) - endif() - endforeach() - endif() - - string(REPLACE \";\" \" \" _link_flags \"${_link_flags}\") - set(${lib_deps} ${_lib_deps} PARENT_SCOPE) - set(${link_flags} \"SHELL:${_link_flags}\" PARENT_SCOPE) -endfunction() -!!ENDIF - -!!IF !equals(TEMPLATE, aux) -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION - IsDebugAndRelease) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -!!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set(_deps - ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} - ) - set(_static_deps -!!IF !isEmpty(CMAKE_STATIC_TYPE) - ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES} -!!ENDIF - ) - - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -!!IF !isEmpty(CMAKE_LIB_SONAME) - \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" -!!ENDIF - # For backward compatibility with CMake < 2.8.12 - \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps};${_static_deps}\" - ) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES - \"${_deps}\" - ) - -!!IF !isEmpty(CMAKE_STATIC_TYPE) - if(NOT "${IsDebugAndRelease}") - set(_genex_condition \"1\") - else() - if("${Configuration}" STREQUAL "DEBUG") - set(_genex_condition \"$<CONFIG:Debug>\") - else() - set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\") - endif() - endif() - - if(_static_deps) - set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\") - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES - \"${_static_deps_genex}\" - ) - endif() - - set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\") - if(_static_link_flags) - set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\") - if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS - \"${_static_link_flags_genex}\" - ) - else() - # Abuse INTERFACE_LINK_LIBRARIES to add link flags when CMake version is too low. - # Strip out SHELL:, because it is not supported in this property. And hope for the best. - string(REPLACE \"SHELL:\" \"\" _static_link_flags_genex \"${_static_link_flags_genex}\") - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES - \"${_static_link_flags_genex}\" - ) - endif() - endif() -!!ENDIF - -!!IF !isEmpty(CMAKE_WINDOWS_BUILD) -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -!!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} - ) - endif() -!!ENDIF -endmacro() -!!ENDIF - -if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - -!!IF !no_module_headers -!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" - ) -!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" - ) -!!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -!!ENDIF -!!ELSE -!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") -!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" - ) -!!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -!!ENDIF -!!ELSE - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\" \"$${CMAKE_INCLUDE_DIR}$${CMAKE_INCLUDE_NAME}\") -!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS - \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" - \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" - ) -!!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -!!ENDIF -!!ENDIF -!!ENDIF -!!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) -!!ENDIF -!!ELSE - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"\") - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -!!ENDIF - - foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS}) - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${_dir}) - endforeach() - -!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - # Only check existence of private includes if the Private component is - # specified. - list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private) - if (NOT _check_private STREQUAL -1) - foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${_dir}) - endforeach() - endif() -!!ENDIF - -!!IF !equals(TEMPLATE, aux) - set(Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS}) - - set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE}) - set(Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS $${MODULE_DEFINES}) -!!ENDIF // TEMPLATE != aux - set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") - -!!IF !isEmpty(CMAKE_INTERFACE_MODULE_DEPS) - list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") -!!ENDIF - - set(Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) - - set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED) - if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED) - set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) - endif() - set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) - if (Qt5$${CMAKE_MODULE_NAME}_FIND_QUIETLY) - set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET) - endif() - set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT) - if (Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT) - set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT EXACT) - endif() - -!!IF !equals(TEMPLATE, aux) - set(Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS \"\") -!!ENDIF // TEMPLATE != aux - - foreach(_module_dep ${_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES}) - if (NOT Qt5${_module_dep}_FOUND) - find_package(Qt5${_module_dep} - $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} - ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} - ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} - PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" NO_DEFAULT_PATH - ) - endif() - - if (NOT Qt5${_module_dep}_FOUND) - set(Qt5$${CMAKE_MODULE_NAME}_FOUND False) - return() - endif() - -!!IF !equals(TEMPLATE, aux) - list(APPEND Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS \"${Qt5${_module_dep}_INCLUDE_DIRS}\") - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"${Qt5${_module_dep}_PRIVATE_INCLUDE_DIRS}\") - list(APPEND Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS}) - list(APPEND Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS}) - list(APPEND Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS}) -!!ENDIF // TEMPLATE != aux - endforeach() -!!IF !equals(TEMPLATE, aux) - list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS) - list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS) - list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS) - list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS) - list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS) -!!ENDIF // TEMPLATE != aux - - # It can happen that the same FooConfig.cmake file is included when calling find_package() - # on some Qt component. An example of that is when using a Qt static build with auto inclusion - # of plugins: - # - # Qt5WidgetsConfig.cmake -> Qt5GuiConfig.cmake -> Qt5Gui_QSvgIconPlugin.cmake -> - # Qt5SvgConfig.cmake -> Qt5WidgetsConfig.cmake -> - # finish processing of second Qt5WidgetsConfig.cmake -> - # return to first Qt5WidgetsConfig.cmake -> - # add_library cannot create imported target "Qt5::Widgets". - # - # Make sure to return early in the original Config inclusion, because the target has already - # been defined as part of the second inclusion. - if(TARGET Qt5::$${CMAKE_MODULE_NAME}) - return() - endif() - - set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\") - -!!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS) - list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") -!!ENDIF - -!!IF !isEmpty(CMAKE_STATIC_TYPE) - if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) -!!IF !isEmpty(CMAKE_DEBUG_TYPE) -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG - _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES - _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS - ) -!!ELSE - _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( - \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG - _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES - _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS - ) -!!ENDIF -!!ENDIF - -!!IF !isEmpty(CMAKE_RELEASE_TYPE) -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE - _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES - _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS - ) -!!ELSE - _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( - \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE - _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES - _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS - ) -!!ENDIF -!!ENDIF - endif() - -!!IF equals(TEMPLATE, aux) - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) -!!ELSE - add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") -!!ENDIF -!!ELSE -!!IF equals(TEMPLATE, aux) - add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) -!!ELSE - add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) -!!ENDIF -!!ENDIF - -!!IF !equals(TEMPLATE, aux) -!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -!!ENDIF -!!ENDIF // TEMPLATE != aux - - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY - INTERFACE_INCLUDE_DIRECTORIES ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS}) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY - INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES}) - - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";")) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";")) - - # Qt 6 forward compatible properties. - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} - PROPERTY $${CMAKE_FEATURE_PROPERTY_PREFIX}QT_ENABLED_PUBLIC_FEATURES - $$join(QT.$${MODULE}.enabled_features, ";")) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} - PROPERTY $${CMAKE_FEATURE_PROPERTY_PREFIX}QT_DISABLED_PUBLIC_FEATURES - $$join(QT.$${MODULE}.disabled_features, ";")) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} - PROPERTY $${CMAKE_FEATURE_PROPERTY_PREFIX}QT_ENABLED_PRIVATE_FEATURES - $$join(QT.$${MODULE}_private.enabled_features, ";")) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} - PROPERTY $${CMAKE_FEATURE_PROPERTY_PREFIX}QT_DISABLED_PRIVATE_FEATURES - $$join(QT.$${MODULE}_private.disabled_features, ";")) - - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_PLUGIN_TYPES \"$${CMAKE_MODULE_PLUGIN_TYPES}\") - - set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) - foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}) - if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR}) - set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST FALSE) - endif() - endforeach() - - if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST) - add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY - INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS} - ) - set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) - foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) - if (TARGET ${dep}Private) - list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) - endif() - endforeach() - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY - INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} - ) - - # Add a versionless target, for compatibility with Qt6. - if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::$${CMAKE_MODULE_NAME}Private) - add_library(Qt::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED) - set_target_properties(Qt::$${CMAKE_MODULE_NAME}Private PROPERTIES - INTERFACE_LINK_LIBRARIES \"Qt5::$${CMAKE_MODULE_NAME}Private\" - ) - endif() - endif() - -!!IF !equals(TEMPLATE, aux) -!!IF !isEmpty(CMAKE_RELEASE_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - -!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) -!!IF isEmpty(CMAKE_DEBUG_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) -!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) -!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" -!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" -!!ENDIF - AND EXISTS -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) -!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) -!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -!!ENDIF // CMAKE_DEBUG_TYPE -!!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD - -!!ENDIF // CMAKE_RELEASE_TYPE - -!!IF !isEmpty(CMAKE_DEBUG_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - -!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) -!!IF isEmpty(CMAKE_RELEASE_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -!!ENDIF - AND EXISTS -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -!!ENDIF // CMAKE_RELEASE_TYPE -!!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD - -!!ENDIF // CMAKE_DEBUG_TYPE -!!ELSE // TEMPLATE != aux - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - INTERFACE_LINK_LIBRARIES \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" - ) -!!ENDIF // TEMPLATE != aux - -!!IF isEmpty(CMAKE_INTERNAL_MODULE) - # In Qt 5.15 the glob pattern was relaxed to also catch plugins not literally named "Plugin". - # Define QT5_STRICT_PLUGIN_GLOB or ModuleName_STRICT_PLUGIN_GLOB to revert to old behavior. - if (QT5_STRICT_PLUGIN_GLOB OR Qt5$${CMAKE_MODULE_NAME}_STRICT_PLUGIN_GLOB) - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - else() - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*.cmake\") - endif() - - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION - IsDebugAndRelease) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -!!ELSE - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} - ) - -!!IF !isEmpty(CMAKE_STATIC_TYPE) - set(_static_deps - ${_Qt5${Plugin}_STATIC_${Configuration}_LIB_DEPENDENCIES} - ) - - if(NOT "${IsDebugAndRelease}") - set(_genex_condition \"1\") - else() - if("${Configuration}" STREQUAL "DEBUG") - set(_genex_condition \"$<CONFIG:Debug>\") - else() - set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\") - endif() - endif() - if(_static_deps) - set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\") - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES - \"${_static_deps_genex}\" - ) - endif() - - set(_static_link_flags \"${_Qt5${Plugin}_STATIC_${Configuration}_LINK_FLAGS}\") - if(_static_link_flags) - set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\") - if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_OPTIONS - \"${_static_link_flags_genex}\" - ) - else() - # Abuse INTERFACE_LINK_LIBRARIES to add link flags when CMake version is too low. - # Strip out SHELL:, because it is not supported in this property. And hope for the best. - string(REPLACE \"SHELL:\" \"\" _static_link_flags_genex \"${_static_link_flags_genex}\") - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES - \"${_static_link_flags_genex}\" - ) - endif() - endif() -!!ENDIF - endmacro() - - if (pluginTargets) - foreach(pluginTarget ${pluginTargets}) - include(${pluginTarget}) - endforeach() - endif() -!!ENDIF // isEmpty(CMAKE_INTERNAL_MODULE) - -!!IF !isEmpty(CMAKE_MODULE_EXTRAS) - include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") -!!ENDIF - -!!IF !isEmpty(CMAKE_MODULE_MACROS) - include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\") -!!ENDIF - - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\") -endif() - -# Add a versionless target, for compatibility with Qt6. -if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND TARGET Qt5::$${CMAKE_MODULE_NAME} AND NOT TARGET Qt::$${CMAKE_MODULE_NAME}) - add_library(Qt::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) - set_target_properties(Qt::$${CMAKE_MODULE_NAME} PROPERTIES - INTERFACE_LINK_LIBRARIES \"Qt5::$${CMAKE_MODULE_NAME}\" - ) -endif() diff --git a/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in b/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in deleted file mode 100644 index 7c42430e97..0000000000 --- a/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ - -set(PACKAGE_VERSION $$CMAKE_PACKAGE_VERSION) - -if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) - set(PACKAGE_VERSION_EXACT TRUE) - endif() -endif() diff --git a/mkspecs/features/data/cmake/Qt5ImportPlugin.cpp.in b/mkspecs/features/data/cmake/Qt5ImportPlugin.cpp.in deleted file mode 100644 index 6e27f7a260..0000000000 --- a/mkspecs/features/data/cmake/Qt5ImportPlugin.cpp.in +++ /dev/null @@ -1,2 +0,0 @@ -#include <QtPlugin> -Q_IMPORT_PLUGIN($$CMAKE_PLUGIN_NAME) diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in deleted file mode 100644 index b550a52c60..0000000000 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +++ /dev/null @@ -1,114 +0,0 @@ - -add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) - -!!IF !isEmpty(CMAKE_STATIC_TYPE) -set(_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_PLUGIN_MODULE_DEPS}\") - -foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES}) - if(NOT Qt5${_module_dep}_FOUND) - find_package(Qt5${_module_dep} - $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} - ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} - ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} - PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" NO_DEFAULT_PATH - ) - endif() -endforeach() - -!!IF !isEmpty(CMAKE_RELEASE_TYPE) -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -_qt5_$${CMAKE_MODULE_NAME}_process_prl_file( - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS -) -!!ELSE -_qt5_$${CMAKE_MODULE_NAME}_process_prl_file( - \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS -) -!!ENDIF -!!ENDIF - -!!IF !isEmpty(CMAKE_DEBUG_TYPE) -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -_qt5_$${CMAKE_MODULE_NAME}_process_prl_file( - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS -) -!!ELSE -_qt5_$${CMAKE_MODULE_NAME}_process_prl_file( - \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS -) -!!ENDIF -!!ENDIF - -set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES - \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_$${CMAKE_PLUGIN_NAME}_Import.cpp\" -) -!!ENDIF - -!!IF !isEmpty(CMAKE_RELEASE_TYPE) -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF -!!IF !isEmpty(CMAKE_DEBUG_TYPE) -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF - -list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) -set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} Qt5::$${CMAKE_PLUGIN_NAME}) -!!IF !isEmpty(CMAKE_STATIC_TYPE) -# $<GENEX_EVAL:...> wasn\'t added until CMake 3.12, so put a version guard around it -if(CMAKE_VERSION VERSION_LESS \"3.12\") - set(_manual_plugins_genex \"$<TARGET_PROPERTY:QT_PLUGINS>\") - set(_plugin_type_genex \"$<TARGET_PROPERTY:QT_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED}>\") - set(_no_plugins_genex \"$<TARGET_PROPERTY:QT_NO_PLUGINS>\") -else() - set(_manual_plugins_genex \"$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS>>\") - set(_plugin_type_genex \"$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED}>>\") - set(_no_plugins_genex \"$<GENEX_EVAL:$<TARGET_PROPERTY:QT_NO_PLUGINS>>\") -endif() -set(_user_specified_genex - \"$<IN_LIST:Qt5::$$CMAKE_PLUGIN_NAME,${_manual_plugins_genex};${_plugin_type_genex}>\" -) -set(_user_specified_genex_versionless - \"$<IN_LIST:Qt::$$CMAKE_PLUGIN_NAME,${_manual_plugins_genex};${_plugin_type_genex}>\" -) -string(CONCAT _plugin_genex - \"$<$<OR:\" - # Add this plugin if it\'s in the list of manually specified plugins or in the list of - # explicitly included plugin types. - \"${_user_specified_genex},\" - \"${_user_specified_genex_versionless},\" - # Add this plugin if all of the following are true: - # 1) the list of explicitly included plugin types is empty - # 2) the QT_PLUGIN_EXTENDS property for the plugin is empty or equal to the current - # module name - # 3) the user hasn\'t explicitly excluded the plugin. - \"$<AND:\" - \"$<STREQUAL:${_plugin_type_genex},>,\" - \"$<OR:\" - # FIXME: The value of CMAKE_MODULE_NAME seems to be wrong (e.g for Svg plugin - # it should be Qt::Svg instead of Qt::Gui). - \"$<STREQUAL:$<TARGET_PROPERTY:Qt5::$${CMAKE_PLUGIN_NAME},QT_PLUGIN_EXTENDS>,Qt::$${CMAKE_MODULE_NAME}>,\" - \"$<STREQUAL:$<TARGET_PROPERTY:Qt5::$${CMAKE_PLUGIN_NAME},QT_PLUGIN_EXTENDS>,>\" - \">,\" - \"$<NOT:$<IN_LIST:Qt5::$${CMAKE_PLUGIN_NAME},${_no_plugins_genex}>>,\" - \"$<NOT:$<IN_LIST:Qt::$${CMAKE_PLUGIN_NAME},${_no_plugins_genex}>>\" - \">\" - \">:Qt5::$$CMAKE_PLUGIN_NAME>\" -) -set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES - ${_plugin_genex} -) -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES - \"$${CMAKE_PLUGIN_QT5_MODULE_DEPS}\" -) -!!ENDIF -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\") -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\") -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\") diff --git a/mkspecs/features/data/dumpvcvars.bat b/mkspecs/features/data/dumpvcvars.bat index 4721da2e39..fe9dfad585 100644 --- a/mkspecs/features/data/dumpvcvars.bat +++ b/mkspecs/features/data/dumpvcvars.bat @@ -1,30 +1,5 @@ -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: :: Copyright (C) 2018 The Qt Company Ltd. -:: Contact: https://www.qt.io/licensing/ -:: -:: This file is part of the tools applications of the Qt Toolkit. -:: -:: $QT_BEGIN_LICENSE:GPL-EXCEPT$ -:: Commercial License Usage -:: Licensees holding valid commercial Qt licenses may use this file in -:: accordance with the commercial license agreement provided with the -:: Software or, alternatively, in accordance with the terms contained in -:: a written agreement between you and The Qt Company. For licensing terms -:: and conditions see https://www.qt.io/terms-conditions. For further -:: information use the contact form at https://www.qt.io/contact-us. -:: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3 as published by the Free Software -:: Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -:: included in the packaging of this file. Please review the following -:: information to ensure the GNU General Public License requirements will -:: be met: https://www.gnu.org/licenses/gpl-3.0.html. -:: -:: $QT_END_LICENSE$ -:: -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @echo off diff --git a/mkspecs/features/data/mac/objc_namespace.sh b/mkspecs/features/data/mac/objc_namespace.sh index ceff2df324..10ace4ff55 100755 --- a/mkspecs/features/data/mac/objc_namespace.sh +++ b/mkspecs/features/data/mac/objc_namespace.sh @@ -1,48 +1,11 @@ #!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is the build configuration utility of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 3 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL3 included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 3 requirements -## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 2.0 or (at your option) the GNU General -## Public license version 3 or any later version approved by the KDE Free -## Qt Foundation. The licenses are as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-2.0.html and -## https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2017 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 script_argument_prefix="-Wobjc_namespace,--" required_arguments="target suffix original_ld" -optional_arguments="exclude_list exclude_regex slient" +optional_arguments="exclude_list exclude_regex silent" for argument in $required_arguments $optional_arguments; do declare "$argument=" @@ -100,11 +63,13 @@ sanitize_address() { echo "0x$address" } +arch_offset=0 read_binary() { local address=$1 local length=$2 - dd if="$target" bs=1 iseek=$address count=$length 2>|/dev/null + seek=$(($address + $arch_offset)) + dd if="$target" bs=1 iseek=$seek count=$length 2>|/dev/null } read_32bit_value() { @@ -112,23 +77,23 @@ read_32bit_value() { read_binary $address 4 | xxd -p | dd conv=swab 2>/dev/null | rev } -inspect_binary() { - inspect_mode="$1" +otool_args= +otool() { + command otool $otool_args "$@" +} - echo -n "🔎 Inspecting binary '$target', " - if [ ! -f "$target" ]; then - echo "target does not exist!" - exit 1 - fi +declare -a extra_classnames_files - read -a mach_header <<< "$(otool -h "$target" -v | tail -n 1)" - if [ "${mach_header[1]}" != "X86_64" ]; then - echo "binary is not 64-bit, only 64-bit binaries are supported!" - exit 1 - fi +inspect_binary() { + inspect_mode="$1" classnames_section="__objc_classname" classnames=$(otool -v -s __TEXT $classnames_section "$target" | tail -n +3) + if [ -z "$classnames" ]; then + echo " ℹ️ No Objective-C classes found in binary" + return 1 + fi + while read -a classname; do address=$(sanitize_address ${classname[0]}) name=${classname[1]} @@ -138,21 +103,26 @@ inspect_binary() { done <<< "$classnames" extra_classnames_file="$(mktemp -t ${classnames_section}_additions).S" + extra_classnames_files+=("$extra_classnames_file") if [ "$inspect_mode" == "inject_classnames" ]; then - echo "class names have not been namespaced, adding suffix '$suffix'..." + echo " ℹ️ Class names have not been namespaced, adding suffix '$suffix'..." printf ".section __TEXT,$classnames_section,cstring_literals,no_dead_strip\n" > $extra_classnames_file elif [ "$inspect_mode" == "patch_classes" ]; then - echo "found namespaced class names, updating class entries..." + echo " ℹ️ Found namespaced class names, updating class entries..." + fi + + classes=$(otool -o -v "$target" | grep "OBJC_CLASS_RO\|OBJC_METACLASS_RO") + if [ -z "$classes" ]; then + echo " 💥 Failed to read class entries from binary" + exit 1 fi - classes=$(otool -o -v "$target" | grep class_ro_t) while read -a class; do address="$(sanitize_address ${class[1]})" - class_flags="0x$(read_32bit_value $address)" if [ -z "$class_flags" ]; then - echo " 💥 failed to read class flags for class at $address" + echo " 💥 Failed to read class flags for class at $address" continue fi @@ -161,13 +131,13 @@ inspect_binary() { name_offset=$(($address + 24)) classname_address="0x$(read_32bit_value $name_offset)" if [ -z "$classname_address" ]; then - echo " 💥 failed to read class name address for class at $address" + echo " 💥 Failed to read class name address for class at $address" continue fi classname=$(get_entry address_to_classname $classname_address) if [ -z "$classname" ]; then - echo " 💥 failed to resolve class name for address '$classname_address'" + echo " 💥 Failed to resolve class name for address '$classname_address'" continue fi @@ -177,7 +147,7 @@ inspect_binary() { else class_type="class" fi - echo " 🚽 skipping excluded $class_type '$classname'" + echo " 🚽 Skipping excluded $class_type '$classname'" continue fi @@ -188,13 +158,13 @@ inspect_binary() { continue fi - echo " 💉 injecting $classnames_section entry '$newclassname' for '$classname'" + echo " 💉 Injecting $classnames_section entry '$newclassname' for '$classname'" printf ".asciz \"$newclassname\"\n" >> $extra_classnames_file elif [ "$inspect_mode" == "patch_classes" ]; then newclassname_address=$(get_entry classname_to_address ${newclassname}) if [ -z "$newclassname_address" ]; then - echo " 💥 failed to resolve class name address for class '$newclassname'" + echo " 💥 Failed to resolve class name address for class '$newclassname'" continue fi @@ -204,7 +174,9 @@ inspect_binary() { class_type="class" fi - echo " 🔨 patching class_ro_t at $address ($class_type) from $classname_address ($classname) to $newclassname_address ($newclassname)" + name_offset=$(($name_offset + $arch_offset)) + + echo " 🔨 Patching class_ro_t at $address ($class_type) from $classname_address ($classname) to $newclassname_address ($newclassname)" echo ${newclassname_address: -8} | rev | dd conv=swab 2>/dev/null | xxd -p -r -seek $name_offset -l 4 - "$target" fi done <<< "$classes" @@ -213,10 +185,43 @@ inspect_binary() { echo "🔩 Linking binary using '$original_ld'..." link_binary -inspect_binary inject_classnames +echo "🔎 Inspecting binary '$target'..." +if [ ! -f "$target" ]; then + echo " 💥 Target does not exist!" + exit 1 +fi -echo "🔩 Re-linking binary with extra __objc_classname section..." -link_binary $extra_classnames_file +read -a mach_header <<< "$(otool -h "$target" -v | tail -n 1)" +if [ "${mach_header[0]}" != "MH_MAGIC_64" ]; then + echo " 💥 Binary is not 64-bit, only 64-bit binaries are supported!" + exit 1 +fi + +architectures=$(otool -f -v "$target" | grep architecture) + +setup_arch() { + arch="$1" + if [ ! -z "$arch" ]; then + otool_args="-arch $arch" + offset=$(otool -f -v "$target" | grep -A 6 "architecture $arch" | grep offset) + offset="${offset##*( )}" + arch_offset="$(echo $offset | cut -d ' ' -f 2)" + echo "🤖 Processing architecture '$arch' at offset $arch_offset..." + fi +} + +while read -a arch; do + setup_arch "${arch[1]}" + inspect_binary inject_classnames + if [ $? -ne 0 ]; then + exit + fi +done <<< "$architectures" -inspect_binary patch_classes +echo "🔩 Re-linking binary with extra __objc_classname section(s)..." +link_binary "${extra_classnames_files[@]}" +while read -a arch; do + setup_arch "${arch[1]}" + inspect_binary patch_classes +done <<< "$architectures" diff --git a/mkspecs/features/data/unix/findclasslist.pl b/mkspecs/features/data/unix/findclasslist.pl deleted file mode 100644 index b74b8b6a58..0000000000 --- a/mkspecs/features/data/unix/findclasslist.pl +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env perl -############################################################################# -## -## Copyright (C) 2016 Intel Corporation. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the build configuration tools of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 3 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL3 included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 3 requirements -## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 2.0 or (at your option) the GNU General -## Public license version 3 or any later version approved by the KDE Free -## Qt Foundation. The licenses are as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-2.0.html and -## https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# - -use strict; -my $syntax = "findclasslist.pl\n" . - "Replaces each \@FILE:filename\@ in stdin with the classes found in that file\n"; - -$\ = $/; -while (<STDIN>) { - chomp; - unless (/\@FILE:(.*)\@/) { - print; - next; - } - - # Replace this line with the class list - open HDR, "<$1" or die("Could not open header $1: $!"); - my $comment = " /* $1 */"; - while (my $line = <HDR>) { - # Match a struct or class declaration, but not a forward declaration - $line =~ /^(?:struct|class|namespace) (?:Q_.*_EXPORT)? (\w+)(?!;)/ or next; - print $comment if $comment; - printf " *%d%s*;\n", length $1, $1; - $comment = 0; - } - close HDR; -} diff --git a/mkspecs/features/dbuscommon.pri b/mkspecs/features/dbuscommon.pri index cadcd46d61..e567889f25 100644 --- a/mkspecs/features/dbuscommon.pri +++ b/mkspecs/features/dbuscommon.pri @@ -34,7 +34,7 @@ for(entry, DBUS_$${dbus_TYPE}S) { for(subent, $$list($$unique(files))) { !contains(subent, .*\\w\\.xml$) { - warning("Invalid D-BUS $${dbus_type}: '$$subent', please use 'com.mydomain.myinterface.xml' instead.") + warning("Invalid D-Bus $${dbus_type}: '$$subent', please use 'com.mydomain.myinterface.xml' instead.") next() } diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index b2985fe89c..2be446e41e 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -122,17 +122,19 @@ breakpad { } c++17: CONFIG += c++1z -c++latest: CONFIG *= c++2a c++1z c++14 c++11 +c++20: CONFIG += c++2a +c++latest: CONFIG *= c++2b c++2a c++1z c++14 c++11 -!c++1z:!c++2a { +!c++1z:!c++2a:!c++2b { # Qt requires C++17 QT_COMPILER_STDCXX_no_L = $$replace(QT_COMPILER_STDCXX, "L$", "") !greaterThan(QT_COMPILER_STDCXX_no_L, 201402): CONFIG += c++1z } -c++1z|c++2a { +c++1z|c++2a|c++2b { # Disable special compiler flags for host builds !host_build|!cross_compile { - c++2a: cxxstd = CXX2A + c++2b: cxxstd = CXX2B + else:c++2a: cxxstd = CXX2A else: cxxstd = CXX1Z } else { # Fall back to c++17, because C++17 is required everywhere, @@ -153,7 +155,8 @@ c++1z|c++2a { unset(cxxstd) } -c99|c11 { +c99|c11|c17|c18 { + c17|c18: cstd = C17 c11: cstd = C11 else: cstd = C99 diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 1c24bf071a..bad84b24f1 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -11,19 +11,4 @@ CONFIG = \ testcase_targets import_plugins import_qpa_plugin \ $$CONFIG -!build_pass:!isEmpty(QT_LICHECK):!QTDIR_build { - # - # call license checker (but cache result for one day) - # - today = $$section(_DATE_, " ", 0, 2) - !isEqual(QMAKE_LICHECK_TIMESTAMP, $$today) { - !system("$$system_quote($$system_path($$[QT_HOST_BINS/src]/$$QT_LICHECK)) check" \ - "$$QT_RELEASE_DATE $$[QMAKE_SPEC] $$[QMAKE_XSPEC]"): \ - error("License check failed! Giving up ...") - - cache(QMAKE_LICHECK_TIMESTAMP, set stash, today) - } - unset(today) -} - load(toolchain) diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 1d52f05e52..ed003e7ac7 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -20,7 +20,16 @@ CONFIG += plugin no_plugin_name_prefix javac.input = JAVASOURCES javac.output = $$CLASS_DIR javac.CONFIG += combine -javac.commands = javac -source 7 -target 7 -Xlint:unchecked -bootclasspath $$ANDROID_JAR_FILE -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEPARATOR))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN} + +# Check for user defined javac build version +javac_target_version = $$ANDROID_JAVAC_TARGET_VERSION +isEmpty(javac_target_version): javac_target_version = 8 + +javac_source_version = $$ANDROID_JAVAC_SOURCE_VERSION +isEmpty(javac_source_version): javac_source_version = 8 + +javac.commands = javac -source $$javac_source_version -target $$javac_target_version -Xlint:unchecked -bootclasspath $$ANDROID_JAR_FILE -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEPARATOR))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN} + # Force rebuild every time, because we don't know the paths of the destination files # as they depend on the code. javac.depends = FORCE diff --git a/mkspecs/features/lrelease.prf b/mkspecs/features/lrelease.prf index f611c74184..15d336d8e5 100644 --- a/mkspecs/features/lrelease.prf +++ b/mkspecs/features/lrelease.prf @@ -24,7 +24,7 @@ all_translations = $$TRANSLATIONS $$EXTRA_TRANSLATIONS for (translation, all_translations) { # mirrors $$LRELEASE_DIR/${QMAKE_FILE_IN_BASE}.qm above translation = $$basename(translation) - QM_FILES += $$OUT_PWD/$$LRELEASE_DIR/$$replace(translation, \\..*$, .qm) + QM_FILES += $$OUT_PWD/$$LRELEASE_DIR/$$replace(translation, \\.[^.]+$, .qm) } embed_translations { qmake_qm_files.files = $$QM_FILES diff --git a/mkspecs/features/mac/asset_catalogs.prf b/mkspecs/features/mac/asset_catalogs.prf index 58211c13a2..1b9745a132 100644 --- a/mkspecs/features/mac/asset_catalogs.prf +++ b/mkspecs/features/mac/asset_catalogs.prf @@ -68,7 +68,7 @@ $$asset_catalog_app_icon_arg \ $$asset_catalog_launch_image_arg \ --output-partial-info-plist $$shell_quote($$asset_catalog_compiler.target) \ - --platform $${version_identifier} \ + --platform $${platform_identifier} \ --minimum-deployment-target $${deployment_target} \ --compile $$shell_quote($$QMAKE_ASSET_CATALOGS_BUILD_PATH) diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 92a9112bca..22c84d6473 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -7,11 +7,17 @@ QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) contains(TEMPLATE, .*app) { !macx-xcode:if(isEmpty(BUILDS)|build_pass) { # Detect changes to the platform SDK - QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION QMAKE_XCODE_DEVELOPER_PATH + QMAKE_EXTRA_VARIABLES += \ + QMAKE_MAC_SDK \ + QMAKE_MAC_SDK_VERSION \ + QMAKE_XCODE_DEVELOPER_PATH \ + _QMAKE_STASH_ \ + QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) } # Detect incompatible SDK versions + # The CMake equivalent is in cmake/QtPublicAppleHelpers.cmake. isEmpty(QT_MAC_SDK_VERSION_MIN): \ QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION @@ -25,11 +31,11 @@ contains(TEMPLATE, .*app) { !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ CONFIG += sdk_no_version_check - QMAKE_MAC_SDK_MAJOR_MINOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1\\2) + QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) - !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_MINOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { + !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ - "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.") + "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") warning("This is an unsupported configuration. You may experience build issues," \ "and by using") warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ @@ -45,29 +51,6 @@ contains(TEMPLATE, .*app) { !no_objective_c:CONFIG += objective_c -qt { - qtConfig(static) { - # C++11 support means using libc++ instead of libstd++. As the - # two libraries are incompatible we need to ensure the end user - # project is built using the same C++11 support/no support as Qt. - qtConfig(c++11) { - CONFIG += c++11 - } else: c++11 { - warning("Qt was not built with C++11 enabled, disabling feature") - CONFIG -= c++11 - } - - !c++11 { - # Explicitly use libstdc++ if C++11 support is not enabled, - # as otherwise the compiler will choose the standard library - # based on the deployment target, which for iOS 7 and OS X 10.9 - # is libc++, and we can't mix and match the two. - QMAKE_CXXFLAGS += -stdlib=libstdc++ - QMAKE_LFLAGS += -stdlib=libstdc++ - } - } -} - # Add the same default rpaths as Xcode does for new projects. # This is especially important for iOS/tvOS/watchOS where no other option is possible. !no_default_rpath { @@ -90,6 +73,19 @@ app_extension_api_only { QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION } +macos { + !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { + # If the user has requested a specific set of architectures, + # build all of those by default, but limited to only those. + CONFIG -= only_active_arch + } else { + # Otherwise allow building all of the architectures available + # in Qt, but only build the active arch (unless the user has + # manually overridden this via CONFIG -= only_active_arch). + QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS + } +} + macx-xcode { qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ @@ -124,12 +120,14 @@ macx-xcode { QMAKE_XCODE_ARCHS = - arch_device.name = "ARCHS[sdk=$${device.sdk}*]" - arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS - QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS - QMAKE_MAC_XCODE_SETTINGS += arch_device + !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { + arch_device.name = "ARCHS[sdk=$${device.sdk}*]" + arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS + QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS + QMAKE_MAC_XCODE_SETTINGS += arch_device + } - simulator { + ios:simulator { arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS @@ -142,18 +140,23 @@ macx-xcode { QMAKE_MAC_XCODE_SETTINGS += only_active_arch } else { device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS - simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS + ios:simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS - isEmpty(VALID_ARCHS): \ - error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") - single_arch: VALID_ARCHS = $$first(VALID_ARCHS) - ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) - ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) + macos { + only_active_arch: DEFAULT_ARCHS = $$system("uname -m") + else: DEFAULT_ARCHS = $$VALID_ARCHS + } + + ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ + $(if $(ARCHS), $(ARCHS), \ + $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ + $(EXPORT_VALID_ARCHS)))) + ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) - QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS + QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS arch_flags = $(EXPORT_ARCH_ARGS) @@ -176,7 +179,7 @@ macx-xcode { # and makes it easier for people to override EXPORT_VALID_ARCHS to limit # individual rules to a different set of architecture(s) from the overall # build (such as machtest in QtCore). - simulator:device { + ios:simulator:device { QMAKE_XARCH_CFLAGS = QMAKE_XARCH_LFLAGS = QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS @@ -185,9 +188,11 @@ macx-xcode { contains(VALID_SIMULATOR_ARCHS, $$arch) { sdk = $$simulator.sdk version_identifier = $$simulator.deployment_identifier + platform_identifier = $$simulator.sdk } else { sdk = $$device.sdk version_identifier = $$device.deployment_identifier + platform_identifier = $$device.sdk } version_min_flags = \ @@ -212,17 +217,25 @@ macx-xcode { QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) } else { - simulator { + ios:simulator { version_identifier = $$simulator.deployment_identifier + platform_identifier = $$simulator.sdk sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) } else { version_identifier = $$device.deployment_identifier + platform_identifier = $$device.sdk sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) } - version_min_flag = -m$${version_identifier}-version-min=$$deployment_target - QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag - QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag - QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag + QMAKE_CFLAGS += -isysroot $$sysroot_path + QMAKE_CXXFLAGS += -isysroot $$sysroot_path + QMAKE_LFLAGS += -isysroot $$sysroot_path + + !isEmpty(version_identifier):!isEmpty(deployment_target) { + version_min_flag = -m$${version_identifier}-version-min=$$deployment_target + QMAKE_CFLAGS += $$version_min_flag + QMAKE_CXXFLAGS += $$version_min_flag + QMAKE_LFLAGS += $$version_min_flag + } } # Enable precompiled headers for multiple architectures diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk index c40f58c987..a32ceacb6c 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,6 +1,6 @@ ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) - CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 + CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) # We don't want to complain about out of date SDK unless the target needs to be remade. @@ -13,12 +13,14 @@ ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) else ifneq ($(CURRENT_MAC_SDK_VERSION),) - $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) + $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) else $(info Unknown error resolving current platform SDK version.) endif - $(info This requires a fresh build. Please wipe the build directory completely,) - $(info including any .qmake.stash and .qmake.cache files generated by qmake.) + $(info This requires a fresh build of your project. Please wipe the build directory) + ifneq ($(EXPORT__QMAKE_STASH_),) + $(info including the qmake cache in $(EXPORT__QMAKE_STASH_)) + endif $(error ^) endif endif diff --git a/mkspecs/features/metatypes.prf b/mkspecs/features/metatypes.prf index 25d05574e6..d23b299403 100644 --- a/mkspecs/features/metatypes.prf +++ b/mkspecs/features/metatypes.prf @@ -1,4 +1,4 @@ -qtPrepareTool(MOC_COLLECT_JSON, moc) +qtPrepareLibExecTool(MOC_COLLECT_JSON, moc) QMAKE_MOC_OPTIONS += --output-json @@ -46,7 +46,7 @@ moc_collect_json.name = Collect moc JSON output into central file install_metatypes { do_install_metatypes.CONFIG += no_check_exist - do_install_metatypes.path = $$[QT_INSTALL_LIBS]/metatypes + do_install_metatypes.path = $$[QT_INSTALL_ARCHDATA]/metatypes do_install_metatypes.files = $$OUT_PWD/$$MOC_COLLECT_JSON_OUTPUT prefix_build { load(qt_build_paths) diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 07f29b8feb..c5504b21b8 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -1,6 +1,6 @@ #global defaults -qtPrepareTool(QMAKE_MOC, moc) +qtPrepareLibExecTool(QMAKE_MOC, moc) isEmpty(MOC_DIR):MOC_DIR = . isEmpty(QMAKE_H_MOD_MOC):QMAKE_H_MOD_MOC = moc_ isEmpty(QMAKE_EXT_CPP_MOC):QMAKE_EXT_CPP_MOC = .moc diff --git a/mkspecs/features/permissions.prf b/mkspecs/features/permissions.prf new file mode 100644 index 0000000000..ac5f2cb108 --- /dev/null +++ b/mkspecs/features/permissions.prf @@ -0,0 +1,40 @@ + +isEmpty(QMAKE_INFO_PLIST): \ + return() + +plist_path = $$absolute_path($$QMAKE_INFO_PLIST, $$_PRO_FILE_PWD_) + +!exists($$plist_path): \ + return() + +for(plugin, QT_PLUGINS) { + !equals(QT_PLUGIN.$${plugin}.TYPE, permissions): \ + next() + + usage_descriptions = $$eval(QT_PLUGIN.$${plugin}.usage_descriptions) + + found_usage_description = false + for(usage_description_key, usage_descriptions) { + usage_description = $$system("/usr/libexec/PlistBuddy" \ + "-c 'print $$usage_description_key' $$plist_path 2>/dev/null", \ + singleLine, exit_code) + + !equals(exit_code, 0): \ + next() + + !isEmpty(usage_description) { + found_usage_description = true + break() + } + } + + !$$found_usage_description: \ + next() + + request_flag = $$eval(QT_PLUGIN.$${plugin}.request_flag) + + QTPLUGIN += $$plugin + QMAKE_LFLAGS += $$request_flag + + QMAKE_INTERNAL_INCLUDED_FILES *= $$QMAKE_INFO_PLIST +} diff --git a/mkspecs/features/qlalr.prf b/mkspecs/features/qlalr.prf index 54d8b583c6..cb12818e39 100644 --- a/mkspecs/features/qlalr.prf +++ b/mkspecs/features/qlalr.prf @@ -1,4 +1,4 @@ -qtPrepareTool(QMAKE_QLALR, qlalr) +qtPrepareLibExecTool(QMAKE_QLALR, qlalr) isEmpty(QLALR_DIR): QLALR_DIR = . diff --git a/mkspecs/features/qmltestcase.prf b/mkspecs/features/qmltestcase.prf index ae4ebef513..95e20a8a4f 100644 --- a/mkspecs/features/qmltestcase.prf +++ b/mkspecs/features/qmltestcase.prf @@ -5,8 +5,12 @@ contains(TEMPLATE, vc.*): DEFINES += QUICK_TEST_SOURCE_DIR=\"$$_PRO_FILE_PWD_\" else: DEFINES += QUICK_TEST_SOURCE_DIR=$$shell_quote(\"$$_PRO_FILE_PWD_\") } else { - !isEmpty(RESOURCES): warning("The RESOURCES qmake variable is empty, the test will probably fail to run") - DEFINES += QUICK_TEST_SOURCE_DIR=\":/\" + isEmpty(RESOURCES) { + ANDROID_EXTRA_PLUGINS *= $$_PRO_FILE_PWD_ + DEFINES += QUICK_TEST_SOURCE_DIR=$$shell_quote(\"assets:/$$basename(_PRO_FILE_PWD_)\") + } else { + DEFINES += QUICK_TEST_SOURCE_DIR=$$shell_quote(\":/\") + } } } else { diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 9d852cf23d..3b71eea6bc 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -2,6 +2,9 @@ # due to required Qt modules being missing. !isEmpty(QMAKE_FAILED_REQUIREMENTS): return() +# hardcoded defaults +QT_CONFIG *= c99 c11 c++11 c++14 c++1z c++17 + qtConfig(thread): CONFIG *= thread #handle defines @@ -13,7 +16,6 @@ win32 { } } CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG -qtConfig(force_asserts): DEFINES += QT_FORCE_ASSERTS no_keywords:DEFINES += QT_NO_KEYWORDS plugin { #Qt plugins static:DEFINES += QT_STATICPLUGIN @@ -59,6 +61,28 @@ qaxserver { !force_import_plugins:!contains(TEMPLATE, ".*app"):!if(contains(TEMPLATE, ".*lib"):dll): \ CONFIG -= import_plugins +unix { + contains(QT_CONFIG, no_direct_extern_access): CONFIG += no_direct_extern_access + else:contains(QT_CONFIG, reduce_relocations):!contains(TEMPLATE, .*lib): { + QMAKE_CFLAGS += $$QMAKE_CFLAGS_PIC + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_PIC + } +} + +# Load the entrypoint module if requested +entrypoint { + win32 { + !console:contains(TEMPLATE, ".*app"): \ + QT_PRIVATE += entrypoint_private + } else:uikit { + qt_depends = $$resolve_depends(QT, "QT.") + !watchos:equals(TEMPLATE, app):contains(qt_depends, gui(-private)?): \ + QT_PRIVATE += entrypoint_private + } +} + +# Will automatically add plugins, so run first +contains(QT_CONFIG, permissions): load(permissions) # qmake variables cannot contain dashes, so normalize the names first CLEAN_QT = $$replace(QT, -private$, _private) @@ -69,13 +93,15 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d QTPLUGIN = $$unique($$list($$lower($$QTPLUGIN))) -import_plugins:qtConfig(static) { +# Sanitize requested plugins, and add any default plugins +import_plugins { manualplugs = $$QTPLUGIN # User may specify plugins. Mostly legacy. autoplugs = # Auto-added plugins. # First round: explicitly specified modules. - plugin_deps = $$all_qt_module_deps + all_plugin_deps = $$all_qt_module_deps + plugin_deps = $$all_plugin_deps for(ever) { - # Automatically link the default plugins for the linked Qt modules. + # Automatically add the default plugins for the linked Qt modules. for (qtmod, plugin_deps) { for (ptype, QT.$${qtmod}.plugin_types) { nptype = $$replace(ptype, [-/], _) @@ -83,7 +109,7 @@ import_plugins:qtConfig(static) { for (plug, QT_PLUGINS) { equals(QT_PLUGIN.$${plug}.TYPE, $$ptype) { for (dep, QT_PLUGIN.$${plug}.EXTENDS) { - !contains(all_qt_module_deps, $$dep) { + !contains(all_plugin_deps, $$dep) { plug = break() } @@ -106,57 +132,74 @@ import_plugins:qtConfig(static) { for (plug, QTPLUGIN): \ plugin_deps += $$eval(QT_PLUGIN.$${plug}.DEPENDS) plugin_deps = $$resolve_depends(plugin_deps, "QT.", ".depends" ".run_depends") - plugin_deps -= $$all_qt_module_deps + plugin_deps -= $$all_plugin_deps + isEmpty(plugin_deps): \ break() # ... and start over if any new Qt modules appeared, # as these may want to load plugins in turn. - all_qt_module_deps += $$plugin_deps + all_plugin_deps += $$plugin_deps } extraplugs = $$manualplugs manualplugs -= $$autoplugs extraplugs -= $$manualplugs !isEmpty(extraplugs): \ warning("Redundant entries in QTPLUGIN: $$extraplugs") - - !isEmpty(QTPLUGIN) { - IMPORT_FILE_CONT = \ - "// This file is autogenerated by qmake. It imports static plugin classes for" \ - "// static plugins specified using QTPLUGIN and QT_PLUGIN_CLASS.<plugin> variables." \ - "$${LITERAL_HASH}include <QtPlugin>" - for (plug, QTPLUGIN) { - plug_class = $$eval(QT_PLUGIN.$${plug}.CLASS_NAME) - !isEmpty(plug_class): \ - IMPORT_FILE_CONT += "Q_IMPORT_PLUGIN($$plug_class)" - else: \ - warning("Plugin class name could not be determined for plugin '$$plug'.") - } - TARGET_BASENAME = $$lower($$basename(TARGET)) - TARGET_BASENAME ~= s/\s/_/g - - IMPORT_CPP = $$OUT_PWD/$${TARGET_BASENAME}_plugin_import.cpp - write_file($$IMPORT_CPP, IMPORT_FILE_CONT)|error() - GENERATED_SOURCES += $$IMPORT_CPP - QMAKE_DISTCLEAN += $$IMPORT_CPP - } } -# Only link against plugins in static builds -!isEmpty(QTPLUGIN):qtConfig(static) { +# Link static plugins +!isEmpty(QTPLUGIN) { for (plug, QTPLUGIN) { + module_config = $$eval(QT_PLUGIN.$${plug}.module_config) + isEmpty(module_config):!qtConfig(static): \ + next() # Compatibility with older modules + + !contains(module_config, staticlib): \ + next() + + plug_class = $$eval(QT_PLUGIN.$${plug}.CLASS_NAME) + !isEmpty(plug_class): \ + IMPORT_FILE_CONT += "Q_IMPORT_PLUGIN($$plug_class)" + else: \ + warning("Plugin class name could not be determined for plugin '$$plug'.") + + plugin_deps = $$eval(QT_PLUGIN.$${plug}.DEPENDS) + plugin_deps = $$resolve_depends(plugin_deps, "QT.", ".depends" ".run_depends") + all_qt_module_deps *= $$plugin_deps + # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. plug_type = $$eval(QT_PLUGIN.$${plug}.TYPE) !isEmpty(plug_type) { - plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB + # Respect target config if Qt provides both debug and release versions + # of each plugin. Otherwise, respect what Qt was configured with. + qtConfig(debug_and_release): config_variable = CONFIG + else: config_variable = QT_CONFIG + + plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix($$config_variable).$$QMAKE_EXTENSION_STATICLIB plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) isEmpty(plug_path): \ plug_path = $$[QT_INSTALL_PLUGINS/get] LIBS += $$plug_path/$$plug_type/$$plug_name } else { - LIBS += -l$${plug}$$qtPlatformTargetSuffix() + LIBS += -l$${plug}$$qtPlatformTargetSuffix(CONFIG) } } + + !isEmpty(IMPORT_FILE_CONT) { + IMPORT_FILE_CONT = \ + "// This file is autogenerated by qmake. It imports static plugin classes for" \ + "// static plugins specified using QTPLUGIN and QT_PLUGIN_CLASS.<plugin> variables." \ + "$${LITERAL_HASH}include <QtPlugin>" \ + "$$IMPORT_FILE_CONT" + + TARGET_BASENAME = $$lower($$basename(TARGET)) + TARGET_BASENAME ~= s/\s/_/g + IMPORT_CPP = $$OUT_PWD/$${TARGET_BASENAME}_plugin_import.cpp + write_file($$IMPORT_CPP, IMPORT_FILE_CONT)|error() + GENERATED_SOURCES += $$IMPORT_CPP + QMAKE_DISTCLEAN += $$IMPORT_CPP + } } # target variable, flag source variable @@ -170,7 +213,7 @@ defineTest(qtProcessModuleFlags) { export($$1) } -unset(using_privates) +unset(using_private_headers) var_sfx = for(ever) { # Topological resolution of modules based on their QT.<module>.depends variable @@ -181,6 +224,7 @@ for(ever) { MODULE_NAME = $$eval(QT.$${QTLIB}.name) MODULE_MODULE = $$eval(QT.$${QTLIB}.module) MODULE_INCLUDES = $$eval(QT.$${QTLIB}.includes) + MODULE_LDFLAGS = $$eval(QT.$${QTLIB}.ldflags) MODULE_LIBS = $$eval(QT.$${QTLIB}.libs) MODULE_FRAMEWORKS = $$eval(QT.$${QTLIB}.frameworks) MODULE_USES = $$eval(QT.$${QTLIB}.uses) @@ -191,8 +235,8 @@ for(ever) { next() } - contains(MODULE_CONFIG, internal_module): \ - using_privates = true + contains(MODULE_CONFIG, internal_module):!isEmpty(MODULE_INCLUDES): \ + using_private_headers = true contains(MODULE_CONFIG, ltcg): \ CONFIG += link_ltcg @@ -201,6 +245,9 @@ for(ever) { MODULE_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS + # Add linker flags before lib + LIBS$$var_sfx += $$MODULE_LDFLAGS + # Frameworks shouldn't need include paths, but much code does not use # module-qualified #includes, so by default we add paths which point # directly into the frameworks. Private modules have somewhat convoluted @@ -215,28 +262,36 @@ for(ever) { # Linking frameworks by absolute path does not work. LIBS$$var_sfx += -framework $$framework } else { - lib = $$MODULE_MODULE$$qtPlatformTargetSuffix() + lib_bases = $$MODULE_MODULE$$qtPlatformTargetSuffix() + darwin: lib_bases *= $$MODULE_MODULE + add_lib_to_pretargetdeps = false win32|contains(MODULE_CONFIG, staticlib) { - lib_missing = true - lib_extensions = $$QMAKE_EXTENSION_STATICLIB - lib_extensions *= $$QMAKE_LIB_EXTENSIONS - candidates = - for(ext, lib_extensions) { - candidate = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$ext - candidates += $$candidate - exists($$candidate) { - lib = $$candidate - lib_missing = false - break() - } + lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB + lib_suffixes = $$QMAKE_EXTENSION_STATICLIB + lib_suffixes *= $$QMAKE_LIB_EXTENSIONS + !xcodebuild: \ + add_lib_to_pretargetdeps = true + } else { + lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB + lib_suffixes = $$QMAKE_EXTENSION_SHLIB + } + candidates = + for(lib_base, lib_bases) { + for(lib_suffix, lib_suffixes) { + candidates += $${lib_prefix}$${lib_base}.$${lib_suffix} } - $$lib_missing { - lib = $$first(candidates) + } + lib = + for(candidate, candidates) { + exists("$$candidate") { + lib = "$$candidate" + break() } - PRE_TARGETDEPS += $$lib - } else { - lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB } + isEmpty(lib): \ + lib = $$first(candidates) + $$add_lib_to_pretargetdeps: \ + PRE_TARGETDEPS += $$lib LIBS$$var_sfx += $$lib } } @@ -247,7 +302,7 @@ for(ever) { !isEmpty(var_sfx): break() var_sfx = _PRIVATE } -!isEmpty(using_privates):!no_private_qt_headers_warning:!build_pass { +!isEmpty(using_private_headers):!no_private_qt_headers_warning:!build_pass { message("This project is using private headers and will therefore be tied to this specific Qt module build version.") message("Running this project against other versions of the Qt modules may crash at any arbitrary point.") message("This is not a bug, but a result of using Qt internals. You have been warned!") @@ -284,7 +339,7 @@ contains(all_qt_module_deps, qml): \ QMLPATHS *= $$[QT_INSTALL_QML/get] # run qmlimportscanner - qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) + qtPrepareLibExecTool(QMLIMPORTSCANNER, qmlimportscanner, , system) for (QMLPATH, QMLPATHS): \ IMPORTPATHS += -importPath $$system_quote($$QMLPATH) diff --git a/mkspecs/features/qt_android_deps.prf b/mkspecs/features/qt_android_deps.prf deleted file mode 100644 index 0fff45f458..0000000000 --- a/mkspecs/features/qt_android_deps.prf +++ /dev/null @@ -1,93 +0,0 @@ - -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -# Generates an xml file to match the library in lib/ listing the dependencies -# of the module on JNI-based libraries etc. Used for deployment of an Android -# app. - -ANDROID_DEPENDS_DIR = $$MODULE_BASE_OUTDIR/lib/ -DEPENDENCY_FILE = $$ANDROID_DEPENDS_DIR$$TARGET-android-dependencies.xml -build_pass|single_android_abi:!isEmpty(QT_ARCH): { - !isEmpty(MODULE_PLUGIN_TYPES) { - for(PLUGIN_TYPE, MODULE_PLUGIN_TYPES) { - ANDROID_BUNDLED_FILES += "plugins/$$PLUGIN_TYPE" - } - } - - !isEmpty(ANDROID_JAR_DEPENDENCIES) { - for(JAR_FILE, ANDROID_JAR_DEPENDENCIES) { - INIT_CLASS = $$section(JAR_FILE, ":", 1, 1) - !isEmpty(INIT_CLASS): INIT_CLASS = "initClass=\"$$INIT_CLASS\"" - JAR_FILE = $$section(JAR_FILE, ":", 0, 0) - FILE_CONTENT += "<jar file=\"$$JAR_FILE\" $$INIT_CLASS />" - } - } - - !isEmpty(ANDROID_BUNDLED_JAR_DEPENDENCIES) { - for(JAR_FILE, ANDROID_BUNDLED_JAR_DEPENDENCIES) { - INIT_CLASS = $$section(JAR_FILE, ":", 1, 1) - !isEmpty(INIT_CLASS): INIT_CLASS = "initClass=\"$$INIT_CLASS\"" - JAR_FILE = $$section(JAR_FILE, ":", 0, 0) - FILE_CONTENT += "<jar bundling=\"1\" file=\"$$JAR_FILE\" $$INIT_CLASS />" - } - } - - !isEmpty(ANDROID_LIB_DEPENDENCIES) { - for(LIB_FILE, ANDROID_LIB_DEPENDENCIES) { - EXTENDS = $$section(LIB_FILE, ":", 1, 1) - !isEmpty(EXTENDS): EXTENDS = "extends=\"$$EXTENDS\"" - LIB_FILE = $$section(LIB_FILE, ":", 0, 0) - LIB_FILE = $$replace(LIB_FILE,"\.so", "_$${QT_ARCH}.so") - !isEmpty(EXTENDS): EXTENDS = $$replace(EXTENDS,"\.so", "_$${QT_ARCH}.so") - FILE_CONTENT += "<lib file=\"$$LIB_FILE\" $$EXTENDS />" - } - } - - !isEmpty(ANDROID_LIB_DEPENDENCY_REPLACEMENTS) { - for(REPLACEMENT, ANDROID_LIB_DEPENDENCY_REPLACEMENTS) { - REPLACEMENT_FILE = $$section(REPLACEMENT, ":", 0, 0) - LIB_FILE = $$section(REPLACEMENT, ":", 1, 1) - REPLACEMENT_FILE = $$replace(REPLACEMENT_FILE,"\.so", "_$${QT_ARCH}.so") - FILE_CONTENT += "<lib file=\"$$LIB_FILE\" replaces=\"$$REPLACEMENT_FILE\" />" - } - } - - !isEmpty(ANDROID_BUNDLED_FILES) { - for (BUNDLED_FILE, ANDROID_BUNDLED_FILES) { - BUNDLED_FILE = $$replace(BUNDLED_FILE,"\.so", "_$${QT_ARCH}.so") - FILE_CONTENT += "<bundled file=\"$$BUNDLED_FILE\" />" - } - } - - !isEmpty(ANDROID_PERMISSIONS) { - for (ANDROID_PERMISSION, ANDROID_PERMISSIONS) { - FILE_CONTENT += "<permission name=\"$$ANDROID_PERMISSION\" />" - } - } - - !isEmpty(ANDROID_FEATURES) { - for (ANDROID_FEATURE, ANDROID_FEATURES) { - FILE_CONTENT += "<feature name=\"$$ANDROID_FEATURE\" />" - } - } - - - !isEmpty(FILE_CONTENT) { - FILE_CONTENT = "<rules><dependencies><lib name=\"$$TARGET\"><depends>" $$FILE_CONTENT "</depends></lib></dependencies></rules>" - write_file($$DEPENDENCY_FILE, FILE_CONTENT)|error() - } -} - -!isEmpty(ANDROID_JAR_DEPENDENCIES)|!isEmpty(ANDROID_LIB_DEPENDENCIES)|!isEmpty(ANDROID_LIB_DEPENDENCY_REPLACEMENTS)|!isEmpty(ANDROID_BUNDLED_JAR_DEPENDENCIES)|!isEmpty(ANDROID_BUNDLED_FILES) { - install_dependencies_file.files = $$DEPENDENCY_FILE - install_dependencies_file.path = $$[QT_INSTALL_LIBS] - INSTALLS += install_dependencies_file -} diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf deleted file mode 100644 index 8354f30eea..0000000000 --- a/mkspecs/features/qt_app.prf +++ /dev/null @@ -1,65 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -TEMPLATE = app - -load(qt_build_paths) -DESTDIR = $$MODULE_BASE_OUTDIR/bin - -isEmpty(VERSION): VERSION = $$MODULE_VERSION -isEmpty(QMAKE_TARGET_DESCRIPTION): \ - QMAKE_TARGET_DESCRIPTION = "Qt $$title($$TARGET)" - -isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle - -host_build: QT -= gui # no host tool will ever use gui -host_build:force_bootstrap { - !build_pass:qtConfig(release_tools): CONFIG += release - contains(QT, core(-private)?|xml) { - QT -= core core-private xml - QT += bootstrap-private - } - target.path = $$[QT_HOST_BINS] -} else { - !build_pass:qtConfig(debug_and_release): CONFIG += release - target.path = $$[QT_INSTALL_BINS] - CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable -} -INSTALLS += target - -load(qt_targets) -load(qt_common) - -qtSetQmlPath() - -no_launch_target: return() - -load(resolve_target) -launch.commands = $$shell_quote($$shell_path($$QMAKE_RESOLVED_TARGET)) -QMAKE_EXTRA_TARGETS += launch - -# Add environment for non-installed builds. -QT_TOOL_NAME = target -qtAddTargetEnv(launch.commands, QT) - -isEmpty(BUILDS)|build_pass { - launch.depends = first -} else { - # For exclusive builds, run the app only once. - launch.CONFIG = recursive - launch.target = launch_all - launch.recurse_target = launch - launch.commands = - - launch_first.depends = $$eval($$first(BUILDS).target)-launch - launch_first.target = launch - QMAKE_EXTRA_TARGETS += launch_first -} diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf deleted file mode 100644 index 55e01e4a65..0000000000 --- a/mkspecs/features/qt_build_config.prf +++ /dev/null @@ -1,153 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) { - QMAKE_QT_MODULE = $$[QT_HOST_DATA/get]/mkspecs/qmodule.pri - !exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) { - debug(1, "Cannot load qmodule.pri!") - } else { - debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") - } -} else { - debug(1, "Not loading qmodule.pri twice") -} - -PRECOMPILED_DIR = .pch -OBJECTS_DIR = .obj -MOC_DIR = .moc -RCC_DIR = .rcc -UI_DIR = .uic -TRACEGEN_DIR = .tracegen -QMLCACHE_DIR = .qmlcache -LRELEASE_DIR = .qm -intel_icl { - # ICL 14.0 has a bug that makes it not find #includes in dirs starting with . - MOC_DIR = tmp/moc - RCC_DIR = tmp/rcc - UI_DIR = tmp/uic -} - -QMAKE_DIR_REPLACE_SANE = PRECOMPILED_DIR OBJECTS_DIR MOC_DIR RCC_DIR UI_DIR - -load(qt_prefix_build_check) - -# force_independent can be set externally. prefix_build not. -qtIsPrefixBuild($$[QT_HOST_DATA]): \ - CONFIG += prefix_build force_independent - -!build_pass:!isEmpty(_QMAKE_SUPER_CACHE_):force_independent { - # When doing a -prefix build of top-level qt5/qt.pro, we need to announce - # this repo's output dir to the other repos. - MODULE_BASE_OUTDIR = $$shadowed($$dirname(_QMAKE_CONF_)) - !contains(QTREPOS, $$MODULE_BASE_OUTDIR): \ - cache(QTREPOS, add super, MODULE_BASE_OUTDIR) - # This repo's module pris' location needs to be made known to qmake. - isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR - modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules - !contains(QMAKEMODULES, $$modpath): \ - cache(QMAKEMODULES, add super, modpath) - unset(modpath) -} - -defineTest(qtSetQmlPath) { - !qtConfig(static)|host_build|no_import_scan: \ - return() - deps = $$replace(QT, -private$, _private) - deps = $$resolve_depends(deps, "QT.") - !contains(deps, qml): \ - return() - - isEmpty(QTREPOS): \ - QTREPOS = $$shadowed($$dirname(_QMAKE_CONF_)) - for (qrep, QTREPOS): \ - exists($$qrep/qml): \ - QMLPATHS += $$qrep/qml - export(QMLPATHS) -} - -# Apply extra compiler flags passed via configure last. -CONFIG = qt_build_extra $$CONFIG - -# Don't actually try to install anything in non-prefix builds. -# This is much easier and safer than making every single INSTALLS -# assignment conditional. -!prefix_build: \ - CONFIG += qt_clear_installs - -cross_compile: \ - CONFIG += force_bootstrap - -android|uikit: \ - CONFIG += builtin_testdata - -# Prevent warnings about object files without any symbols -macos: CONFIG += no_warn_empty_obj_files - -# Make sure the doc features are loaded last since they depend on other -# features setting up things like includepaths to find everything. -CONFIG = prepare_docs qt_docs_targets $$CONFIG - -CONFIG += \ - utf8_source \ - create_prl link_prl \ - no_private_qt_headers_warning QTDIR_build \ - qt_example_installs \ - # Qt modules get compiled without exceptions enabled by default. - # However, testcases should be still built with exceptions. - exceptions_off testcase_exceptions - -# Under Windows, this is neither necessary (transitive deps are automatically -# resolved), nor functional (.res files end up in .prl files and break things). -unix: CONFIG += explicitlib - -# By default we want tests on macOS to be built as standalone executables -macos: CONFIG += testcase_no_bundle - -# Override MinGW's definition in _mingw.h -mingw: DEFINES += WINVER=0x0601 _WIN32_WINNT=0x0601 - -defineTest(qtBuildPart) { - bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS) - isEmpty(bp): bp = $$QT_BUILD_PARTS - contains(bp, $$1): return(true) - return(false) -} - -defineTest(qtNomakeTools) { - qtBuildPart(tools): return() - for (d, 1) { - $${d}.CONFIG += no_default_target no_default_install - export($${d}.CONFIG) - } -} - -# This overloads the same function from qt_functions.prf. -# This is not in qt_module.prf, as that gets loaded too late. -defineTest(qtConfig) { - modules = $$QT $$QT_PRIVATE $$QT_FOR_PRIVATE $$QT_FOR_CONFIG - modules ~= s,-private$,_private,g - modules = $$resolve_depends(modules, "QT.", ".depends") - isEmpty(MODULE): \ - MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) - exists($$OUT_PWD/qt$${MODULE}-config.pri) { - include($$OUT_PWD/qt$${MODULE}-config.pri) - modules += $${MODULE} $${MODULE}_private - } - modules += global global_private - modules = $$reverse(modules) - for (module, modules) { - contains(QT.$${module}.enabled_features, $$1): \ - return(true) - contains(QT.$${module}.disabled_features, $$1): \ - return(false) - } - error("Could not find feature $${1}.") -} diff --git a/mkspecs/features/qt_build_extra.prf b/mkspecs/features/qt_build_extra.prf deleted file mode 100644 index a1512c3a19..0000000000 --- a/mkspecs/features/qt_build_extra.prf +++ /dev/null @@ -1,41 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -equals(TEMPLATE, subdirs): return() - -# It's likely that these extra flags will be wrong for host builds, -# and the bootstrapped tools usually don't need them anyway. -host_build:cross_compile: return() - -# The headersclean check needs defines and includes even for -# header-only modules. -DEFINES += $$EXTRA_DEFINES -INCLUDEPATH += $$EXTRA_INCLUDEPATH - -# The other flags are relevant only for actual libraries. -equals(TEMPLATE, aux): return() - -QMAKE_LIBDIR += $$EXTRA_LIBDIR -QMAKE_FRAMEWORKPATH += $$EXTRA_FRAMEWORKPATH - -# Static libs need no rpaths -static: return() - -for (rp, EXTRA_RPATHS) { - absrp = $$absolute_path($$rp, $$[QT_INSTALL_LIBS]) - !isEqual(absrp, $$rp) { - isEmpty(QMAKE_REL_RPATH_BASE)|!contains(INSTALLS, target): \ - rp = $$absrp - else: \ - rp = $$relative_path($$absrp, $$qtRelativeRPathBase()) - } - QMAKE_RPATHDIR += $$rp -} diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf deleted file mode 100644 index 8e4ef3e803..0000000000 --- a/mkspecs/features/qt_build_paths.prf +++ /dev/null @@ -1,29 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -# Find the module's source root dir. -isEmpty(_QMAKE_CONF_): error("Project has no top-level .qmake.conf file.") -MODULE_BASE_INDIR = $$dirname(_QMAKE_CONF_) -REAL_MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_INDIR) -MODULE_BASE_OUTDIR = $$REAL_MODULE_BASE_OUTDIR -!isEmpty(MODULE_BASE_DIR): MODULE_SYNCQT_DIR = $$MODULE_BASE_DIR # compat for webkit -isEmpty(MODULE_SYNCQT_DIR): MODULE_SYNCQT_DIR = $$MODULE_BASE_INDIR -isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR - -exists($$MODULE_BASE_INDIR/.git): \ - CONFIG += git_build - -!force_independent { - # If the module is not built independently, everything ends up in qtbase. - # This is the case in non-prefix builds, except for selected modules. - MODULE_BASE_OUTDIR = $$[QT_INSTALL_PREFIX] - MODULE_QMAKE_OUTDIR = $$[QT_INSTALL_PREFIX] -} diff --git a/mkspecs/features/qt_clear_installs.prf b/mkspecs/features/qt_clear_installs.prf deleted file mode 100644 index 66d12f9d6d..0000000000 --- a/mkspecs/features/qt_clear_installs.prf +++ /dev/null @@ -1,12 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -INSTALLS = diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf deleted file mode 100644 index c9b8018b63..0000000000 --- a/mkspecs/features/qt_common.prf +++ /dev/null @@ -1,163 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -QMAKE_DIR_REPLACE_SANE += DESTDIR -CONFIG -= debug_and_release_target - -DEFINES *= QT_NO_NARROWING_CONVERSIONS_IN_CONNECT - -qtConfig(c++11): CONFIG += c++11 strict_c++ -qtConfig(c++14): CONFIG += c++14 -qtConfig(c++1z): CONFIG += c++1z -qtConfig(c++2a): CONFIG += c++2a -qtConfig(c99): CONFIG += c99 -qtConfig(c11): CONFIG += c11 -qtConfig(separate_debug_info): CONFIG += separate_debug_info -qtConfig(stack-protector-strong): CONFIG += stack_protector_strong -contains(TEMPLATE, .*lib) { - # module and plugins - unix:qtConfig(reduce_relocations): CONFIG += bsymbolic_functions -} -contains(TEMPLATE, .*lib)|contains(TEMPLATE, aux) { - !isEmpty(_QMAKE_SUPER_CACHE_): \ - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR - host_build { - qqt_libdir = \$\$\$\$[QT_HOST_LIBS] - qt_libdir = $$[QT_HOST_LIBS] - } else { - qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] - qt_libdir = $$[QT_INSTALL_LIBS] - } - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { - lib_replace0.match = $$rplbase/lib/ - lib_replace0.replace = $$qqt_libdir/ - lib_replace0.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace0 - lib_replace.match = "[^ ']*$$rplbase/lib" - lib_replace.replace = - } else { - lib_replace.match = $$rplbase/lib - lib_replace.replace = $$qqt_libdir - } - lib_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace - !equals(qt_libdir, $$rplbase/lib) { - qtlibdir_replace.match = $$qt_libdir - qtlibdir_replace.replace = $$qqt_libdir - qtlibdir_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace - } -} -contains(TEMPLATE, .*lib)|darwin { - if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols -} - -# Apple deprecated the entire OpenGL API in favor of Metal, which -# we are aware of, so silence the deprecation warnings in code. -# This does not apply to user-code, which will need to silence -# their own warnings if they use the deprecated APIs explicitly. -macos: DEFINES += GL_SILENCE_DEPRECATION -uikit: DEFINES += GLES_SILENCE_DEPRECATION - -# The remainder of this file must not apply to host tools/libraries, -# as the host compiler's version and capabilities are not checked. -host_build:cross_compile: return() - -# Extra warnings for Qt non-example code, to ensure cleanliness of the sources. -# The block below may turn these warnings into errors for some Qt targets. -# -Wdate-time: warn if we use __DATE__ or __TIME__ (we want to be able to reproduce the exact same binary) -# -Wvla: use of variable-length arrays (an extension to C++) -clang { - clang_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION} - apple_ver = $${QT_APPLE_CLANG_MAJOR_VERSION}.$${QT_APPLE_CLANG_MINOR_VERSION} - versionAtLeast(clang_ver, 3.5): \ - QMAKE_CXXFLAGS_WARN_ON += -Wdate-time - - versionAtLeast(clang_ver, 3.6)|versionAtLeast(apple_ver, 6.3): \ - QMAKE_CXXFLAGS_WARN_ON += -Winconsistent-missing-override - - darwin { - QMAKE_CXXFLAGS_WARN_ON += \ - -Wobjc-interface-ivars \ - -Wobjc-method-access \ - -Wobjc-multiple-method-names - - # Clang/LLVM 5.0 and Xcode 9.0 introduced unguarded availability warnings. - # The same construct has been a hard error in Swift from the very beginning. - versionAtLeast(clang_ver, 5.0)|versionAtLeast(apple_ver, 9.0): \ - QMAKE_CXXFLAGS_WARN_ON += \ - -Werror=unguarded-availability \ - -Werror=unguarded-availability-new \ - -Werror=unsupported-availability-guard - } -} else: gcc:!intel_icc { - QMAKE_CXXFLAGS_WARN_ON += -Wvla - # GCC 5 fixed -Wmissing-field-initializers for when there are no initializers - lessThan(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS_WARN_ON += -Wno-missing-field-initializers - # GCC 5 introduced -Wdate-time - greaterThan(QT_GCC_MAJOR_VERSION, 4): QMAKE_CXXFLAGS_WARN_ON += -Wdate-time - # GCC 6 introduced these - greaterThan(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS_WARN_ON += -Wshift-overflow=2 -Wduplicated-cond - # GCC 7 has a lot of false positives relating to this, so disable completely - greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-stringop-overflow - # GCC 9 introduced -Wformat-overflow in -Wall, but it is buggy: - greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow - ver = $${QT_GCC_MAJOR_VERSION}.$${QT_GCC_MINOR_VERSION} - versionAtLeast(ver, 9.2): QMAKE_CXXFLAGS_WARN_ON += -Wsuggest-override -} - -warnings_are_errors:warning_clean { - # If the module declares that it has does its clean-up of warnings, enable -Werror. - # This setting is compiler-dependent anyway because it depends on the version of the - # compiler. - clang { - # Apple clang 4.0-4.2,5.0-5.1,6.0-6.4,7.0-7.3,8.0-8.3,9.0-9.2 - # Regular clang 3.x-7.0 - apple_ver = $${QT_APPLE_CLANG_MAJOR_VERSION}.$${QT_APPLE_CLANG_MINOR_VERSION} - reg_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION} - contains(apple_ver, "4\\.[012]|5\\.[01]|6\\.[01234]|7\\.[0123]|8\\.[0123]|9\\.[012]")|contains(reg_ver, "[345]\\.|[67]\\.0") { - QMAKE_CXXFLAGS_WARN_ON += -Werror -Wno-error=\\$${LITERAL_HASH}warnings -Wno-error=deprecated-declarations $$WERROR - } - } else:intel_icc:linux { - # Intel CC 13.0 - 18.0, on Linux only - ver = $${QT_ICC_MAJOR_VERSION}.$${QT_ICC_MINOR_VERSION} - linux:contains(ver, "(1[345678]\\.|19\\.0)") { - # 177: function "entity" was declared but never referenced - # (too aggressive; ICC reports even for functions created due to template instantiation) - # 1224: #warning directive - # 1478: function "entity" (declared at line N) was declared deprecated - # 1786: function "entity" (declared at line N of "file") was declared deprecated ("message") - # 1881: argument must be a constant null pointer value - # (NULL in C++ is usually a literal 0) - QMAKE_CXXFLAGS_WARN_ON += -Werror -ww177,1224,1478,1786,1881 $$WERROR - } - } else:gcc:!clang:!intel_icc:!rim_qcc { - # GCC 4.6-4.9, 5.x, ... - ver = $${QT_GCC_MAJOR_VERSION}.$${QT_GCC_MINOR_VERSION} - contains(ver, "(4\\.[6789]|[5-9]\\..)") { - QMAKE_CXXFLAGS_WARN_ON += -Werror -Wno-error=cpp -Wno-error=deprecated-declarations $$WERROR - - # GCC prints this bogus warning, after it has inlined a lot of code - # error: assuming signed overflow does not occur when assuming that (X + c) < X is always false - QMAKE_CXXFLAGS_WARN_ON += -Wno-error=strict-overflow - - # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135 - android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix - } - } else:msvc:!intel_icl { - # enable for MSVC 2015, MSVC 2017 - contains(MSVC_VER, "1[45].0"): QMAKE_CXXFLAGS_WARN_ON += -WX - } - unset(ver) -} - diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index 93c54e3010..40105f0ab2 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -26,6 +26,7 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] QT_MODULE_HOST_LIB_BASE = $$[QT_HOST_LIBS] + QT_MODULE_HOST_LIBEXEC_BASE = $$[QT_HOST_LIBEXECS] QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] include($$mod) } @@ -35,8 +36,8 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri unset(QT_MODULE_INCLUDE_BASE) unset(QT_MODULE_LIB_BASE) unset(QT_MODULE_HOST_LIB_BASE) + unset(QT_MODULE_HOST_LIBEXEC_BASE) unset(QT_MODULE_BIN_BASE) } load(qt_functions) - diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf deleted file mode 100644 index 93448acb91..0000000000 --- a/mkspecs/features/qt_configure.prf +++ /dev/null @@ -1,2466 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -QT_CONFIGURE_REPORT = -QT_CONFIGURE_NOTES = -QT_CONFIGURE_WARNINGS = -QT_CONFIGURE_ERRORS = - -defineTest(qtConfAddReport) { - QT_CONFIGURE_REPORT += "$$join(1, $$escape_expand(\\n))" - export(QT_CONFIGURE_REPORT) -} - -defineTest(qtConfAddNote) { - QT_CONFIGURE_NOTES += "Note: $$join(1, $$escape_expand(\\n))" - export(QT_CONFIGURE_NOTES) -} - -defineTest(qtConfAddWarning) { - QT_CONFIGURE_WARNINGS += "WARNING: $$join(1, $$escape_expand(\\n))" - export(QT_CONFIGURE_WARNINGS) -} - -defineTest(qtConfAddError) { - QT_CONFIGURE_ERRORS += "ERROR: $$join(1, $$escape_expand(\\n))" - export(QT_CONFIGURE_ERRORS) - equals(2, log):qt_conf_tests_allowed { - CONFIG += mention_config_log - export(CONFIG) - } -} - -defineTest(qtConfFatalError) { - qtConfAddError($$1, $$2) - qtConfPrintReport() - error() -} - -# Return a string list for the specified JSON path, which may be either a -# single string or an array of strings. -# Note that this returns a variable name, so it can be directly iterated over. -defineReplace(qtConfScalarOrList) { - defined($$1, var): return($$1) - vals = $$list() - for (i, $${1}._KEYS_): \ - $$vals += $$eval($${1}.$$i) - export($$vals) - return($$vals) -} - -defineTest(qtConfCommandlineSetInput) { - arg = $${1} - val = $${2} - !isEmpty($${currentConfig}.commandline.options.$${arg}.name): \ - arg = $$eval($${currentConfig}.commandline.options.$${arg}.name) - !isEmpty(config.input.$$arg) { - oldval = $$eval(config.input.$$arg) - equals(oldval, $$val): \ - qtConfAddNote("Option '$$arg' with value '$$val' was specified twice") - else: \ - qtConfAddNote("Overriding option '$$arg' with '$$val' (was: '$$oldval')") - } - - config.input.$$arg = $$val - export(config.input.$$arg) -} - -defineReplace(qtConfGetNextCommandlineArg) { - c = $$take_first(QMAKE_EXTRA_ARGS) - export(QMAKE_EXTRA_ARGS) - return($$c) -} - -defineReplace(qtConfPeekNextCommandlineArg) { - return($$first(QMAKE_EXTRA_ARGS)) -} - -defineTest(qtConfCommandline_boolean) { - opt = $${1} - val = $${2} - isEmpty(val): val = yes - - !equals(val, yes):!equals(val, no) { - qtConfAddError("Invalid value given for boolean command line option '$$opt'.") - return() - } - - qtConfCommandlineSetInput($$opt, $$val) -} - -defineTest(qtConfCommandline_void) { - opt = $${1} - val = $${2} - !isEmpty(val) { - qtConfAddError("Command line option '$$opt' expects no argument ('$$val' given).") - return() - } - - val = $$eval($${currentConfig}.commandline.options.$${opt}.value) - isEmpty(val): val = yes - - qtConfCommandlineSetInput($$opt, $$val) -} - -defineTest(qtConfCommandline_enum) { - opt = $${1} - val = $${2} - isEmpty(val): val = yes - - # validate and map value - mapped = $$eval($${currentConfig}.commandline.options.$${opt}.values.$${val}) - isEmpty(mapped) { - # just a list of allowed values - for (i, $${currentConfig}.commandline.options.$${opt}.values._KEYS_) { - equals($${currentConfig}.commandline.options.$${opt}.values.$${i}, $$val) { - mapped = $$val - break() - } - } - } - isEmpty(mapped) { - qtConfAddError("Invalid value '$$val' supplied to command line option '$$opt'.") - return() - } - - qtConfCommandlineSetInput($$opt, $$mapped) -} - -defineTest(qtConfValidateValue) { - opt = $${1} - val = $${2} - - validValues = $$eval($${currentConfig}.commandline.options.$${opt}.values._KEYS_) - isEmpty(validValues): \ - return(true) - - for (i, validValues) { - equals($${currentConfig}.commandline.options.$${opt}.values.$${i}, $$val): \ - return(true) - } - - qtConfAddError("Invalid value '$$val' supplied to command line option '$$opt'.") - return(false) -} - -defineTest(qtConfCommandline_string) { - opt = $${1} - val = $${2} - nextok = $${3} - isEmpty(val):$$nextok: val = $$qtConfGetNextCommandlineArg() - - # Note: Arguments which are variable assignments are legit here. - contains(val, "^-.*")|isEmpty(val) { - qtConfAddError("No value supplied to command line option '$$opt'.") - return() - } - - !qtConfValidateValue($$opt, $$val): \ - return() - - qtConfCommandlineSetInput($$opt, $$val) -} - -defineTest(qtConfCommandline_optionalString) { - opt = $${1} - val = $${2} - nextok = $${3} - isEmpty(val) { - $$nextok: val = $$qtConfPeekNextCommandlineArg() - contains(val, "^-.*|[A-Z0-9_]+=.*")|isEmpty(val): \ - val = "yes" - else: \ - val = $$qtConfGetNextCommandlineArg() - } - - !qtConfValidateValue($$opt, $$val): \ - return() - - qtConfCommandlineSetInput($$opt, $$val) -} - - -defineTest(qtConfCommandline_addString) { - opt = $${1} - val = $${2} - nextok = $${3} - isEmpty(val):$$nextok: val = $$qtConfGetNextCommandlineArg() - - # Note: Arguments which are variable assignments are legit here. - contains(val, "^-.*")|isEmpty(val) { - qtConfAddError("No value supplied to command line option '$$opt'.") - return() - } - - !qtConfValidateValue($$opt, $$val): \ - return() - - !isEmpty($${currentConfig}.commandline.options.$${opt}.name): \ - opt = $$eval($${currentConfig}.commandline.options.$${opt}.name) - - config.input.$$opt += $$val - export(config.input.$$opt) -} - -defineTest(qtConfCommandline_redo) { - !exists($$OUT_PWD/config.opt) { - qtConfAddError("No config.opt present - cannot redo configuration.") - return() - } - QMAKE_EXTRA_REDO_ARGS = $$cat($$OUT_PWD/config.opt, lines) - export(QMAKE_EXTRA_REDO_ARGS) # just for config.log - QMAKE_EXTRA_ARGS = $$QMAKE_EXTRA_REDO_ARGS $$QMAKE_EXTRA_ARGS - export(QMAKE_EXTRA_ARGS) - QMAKE_REDO_CONFIG = true - export(QMAKE_REDO_CONFIG) -} - -defineTest(qtConfParseCommandLine) { - customCalls = - for (cc, allConfigs) { - custom = $$eval($${cc}.commandline.custom) - - !isEmpty(custom) { - customCall = qtConfCommandline_$$custom - !defined($$customCall, test): \ - error("Custom command line callback '$$custom' is undefined.") - customCalls += $$customCall - } - } - - for (ever) { - c = $$qtConfGetNextCommandlineArg() - isEmpty(c): break() - - didCustomCall = false - for (customCall, customCalls) { - $${customCall}($$c) { - didCustomCall = true - break() - } - } - $$didCustomCall: \ - next() - - contains(c, "([A-Z0-9_]+)=(.*)") { - opt = $$replace(c, "^([A-Z0-9_]+)=(.*)", "\\1") - val = $$replace(c, "^([A-Z0-9_]+)=(.*)", "\\2") - for (cc, allConfigs) { - var = $$eval($${cc}.commandline.assignments.$${opt}) - !isEmpty(var): \ - break() - } - isEmpty(var) { - qtConfAddError("Assigning unknown variable '$$opt' on command line.") - return() - } - config.input.$$var = $$val - export(config.input.$$var) - next() - } - - # parse out opt and val - nextok = false - contains(c, "^--?enable-(.*)") { - opt = $$replace(c, "^--?enable-(.*)", "\\1") - val = yes - } else: contains(c, "^--?(disable|no)-(.*)") { - opt = $$replace(c, "^--?(disable|no)-(.*)", "\\2") - val = no - } else: contains(c, "^--([^=]+)=(.*)") { - opt = $$replace(c, "^--([^=]+)=(.*)", "\\1") - val = $$replace(c, "^--([^=]+)=(.*)", "\\2") - } else: contains(c, "^--(.*)") { - opt = $$replace(c, "^--(.*)", "\\1") - val = - } else: contains(c, "^-(.*)") { - opt = $$replace(c, "^-(.*)", "\\1") - val = - nextok = true - for (cc, allConfigs) { - type = $$eval($${cc}.commandline.options.$${opt}) - !isEmpty(type): break() - type = $$eval($${cc}.commandline.options.$${opt}.type) - !isEmpty(type): break() - } - isEmpty(type):contains(opt, "(qt|system)-.*") { - val = $$replace(opt, "(qt|system)-(.*)", "\\1") - opt = $$replace(opt, "(qt|system)-(.*)", "\\2") - } - } else { - qtConfAddError("Invalid command line parameter '$$c'.") - return() - } - - for (cc, allConfigs) { - type = $$eval($${cc}.commandline.options.$${opt}) - isEmpty(type): \ - type = $$eval($${cc}.commandline.options.$${opt}.type) - isEmpty(type) { - # no match in the regular options, try matching the prefixes - for (p, $${cc}.commandline.prefix._KEYS_) { - e = "^-$${p}(.*)" - contains(c, $$e) { - opt = $$eval($${cc}.commandline.prefix.$${p}) - val = $$replace(c, $$e, "\\1") - nextok = true - type = "addString" - break() - } - } - } - !isEmpty(type) { - currentConfig = $$cc - break() - } - } - # handle builtin [-no]-feature-xxx - isEmpty(type):contains(opt, "feature-(.*)") { - opt ~= s,^feature-,, - found = false - for (cc, allConfigs) { - contains($${cc}.features._KEYS_, $$opt) { - found = true - break() - } - } - !$$found { - qtConfAddError("Enabling/Disabling unknown feature '$$opt'.") - return() - } - # this is a boolean enabling/disabling the corresponding feature - type = boolean - } - - isEmpty(type):contains(opt, "skip") { - isEmpty(skipOptionWarningAdded) { - qtConfAddWarning("Command line option -skip is only effective in top-level builds.") - skipOptionWarningAdded = 1 - } - val = $$qtConfGetNextCommandlineArg() - next() - } - - isEmpty(type) { - qtConfAddError("Unknown command line option '$$c'.") - equals(config.input.continue, yes): \ - next() - else: \ - return() - } - - call = "qtConfCommandline_$${type}" - !defined($$call, test): \ - error("Command line option '$$c' has unknown type '$$type'.") - - # now that we have opt and value, process it - $${call}($$opt, $$val, $$nextok) - } -} - -defineReplace(qtConfToolchainSupportsFlag) { - test_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR) - test_cmd_base = "$$QMAKE_CD $$system_quote($$system_path($$test_out_dir)) &&" - - conftest = "int main() { return 0; }" - write_file("$$test_out_dir/conftest.cpp", conftest)|error() - - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_CXX $$QMAKE_CXXFLAGS $${1} -o conftest-out conftest.cpp"): \ - return(true) - return(false) -} - -defineTest(qtConfTest_compilerSupportsFlag) { - flag = $$eval($${1}.flag) - - return($$qtConfToolchainSupportsFlag($$flag)) -} - -defineTest(qtConfTest_linkerSupportsFlag) { - flag = $$eval($${1}.flag) - - use_bfd_linker: \ - LFLAGS = -fuse-ld=bfd - use_gold_linker: \ - LFLAGS = -fuse-ld=gold - use_lld_linker: \ - LFLAGS = -fuse-ld=lld - - return($$qtConfToolchainSupportsFlag($$LFLAGS "-Wl,$$flag")) -} - -defineReplace(qtConfFindInPathList) { - # This nesting is consistent with Apple ld -search_paths_first, - # and presumably with GNU ld (no actual documentation found). - for (dir, 2) { - for (file, 1) { - exists("$$dir/$$file"): \ - return("$$dir/$$file") - } - } - return() -} - -defineReplace(qtConfFindInPath) { - ensurePathEnv() - equals(QMAKE_HOST.os, Windows):!contains(1, .*\\.exe): 1 = $${1}.exe - return($$qtConfFindInPathList($$1, $$2 $$QMAKE_PATH_ENV)) -} - -defineReplace(qtConfPkgConfigEnv) { - env = - !isEmpty(PKG_CONFIG_SYSROOT_DIR): env = "$${SETENV_PFX}PKG_CONFIG_SYSROOT_DIR=$${PKG_CONFIG_SYSROOT_DIR}$${SETENV_SFX} " - !isEmpty(PKG_CONFIG_LIBDIR): env = "$$env$${SETENV_PFX}PKG_CONFIG_LIBDIR=$${PKG_CONFIG_LIBDIR}$${SETENV_SFX} " - return($$env) -} - -defineReplace(qtConfPkgConfig) { - host = $$1 - isEmpty(host): host = false - - $$host { - pkg_config = $$qtConfFindInPath("pkg-config") - } else { - pkg_config = "$$qtConfPkgConfigEnv()$$PKG_CONFIG_EXECUTABLE" - } - - return($$pkg_config) -} - -defineTest(qtConfPkgConfigPackageExists) { - isEmpty(1)|isEmpty(2): \ - return(false) - - !qtRunLoggedCommand("$${1} --exists --silence-errors $${2}"): \ - return(false) - - return(true) -} - -defineReplace(qtSystemQuote) { - args = - for (a, 1): \ - args += $$system_quote($$a) - return($$args) -} - -defineReplace(qtConfPrepareArgs) { - return($$qtSystemQuote($$split(1))) -} - -defineTest(qtConfSetupLibraries) { - asspfx = $${currentConfig}.commandline.assignments - for (l, $${currentConfig}.libraries._KEYS_) { - lpfx = $${currentConfig}.libraries.$${l} - # 'export' may be omitted, in which case it falls back to the library's name - !defined($${lpfx}.export, var) { - $${lpfx}.export = $$replace(l, -, _) - export($${lpfx}.export) - } - # 'export' may also be empty, but we need a derived identifier - alias = $$eval($${lpfx}.export) - isEmpty(alias): alias = $$replace(l, -, _) - $${lpfx}.alias = $$alias - export($${lpfx}.alias) - # make it easy to refer to the library by its export name. - $${currentConfig}.exports._KEYS_ += $$alias - $${currentConfig}.exports.$$alias += $$l - export($${currentConfig}.exports.$$alias) - isEmpty($${lpfx}.sources._KEYS_): \ - error("Library $$l defines no sources") - for (s, $${lpfx}.sources._KEYS_) { - spfx = $${lpfx}.sources.$${s} - # link back to parent object - $${spfx}.library = $$l - export($${spfx}.library) - # a plain string is transformed into a structure - isEmpty($${spfx}._KEYS_) { - $${spfx}.libs = $$eval($${spfx}) - export($${spfx}.libs) - } - # if the type is missing (implicitly in the case of plain strings), assume 'inline' - isEmpty($${spfx}.type) { - $${spfx}.type = inline - export($${spfx}.type) - } - } - } - $${currentConfig}.exports._KEYS_ = $$unique($${currentConfig}.exports._KEYS_) - export($${currentConfig}.exports._KEYS_) - - for (alias, $${currentConfig}.exports._KEYS_) { - ua = $$upper($$alias) - $${asspfx}._KEYS_ += \ - $${ua}_PREFIX $${ua}_INCDIR $${ua}_LIBDIR \ - $${ua}_LIBS $${ua}_LIBS_DEBUG $${ua}_LIBS_RELEASE - uapfx = $${asspfx}.$${ua} - $${uapfx}_PREFIX = $${alias}.prefix - $${uapfx}_INCDIR = $${alias}.incdir - $${uapfx}_LIBDIR = $${alias}.libdir - $${uapfx}_LIBS = $${alias}.libs - $${uapfx}_LIBS_DEBUG = $${alias}.libs.debug - $${uapfx}_LIBS_RELEASE = $${alias}.libs.release - export($${uapfx}_PREFIX) - export($${uapfx}_INCDIR) - export($${uapfx}_LIBDIR) - export($${uapfx}_LIBS) - export($${uapfx}_LIBS_DEBUG) - export($${uapfx}_LIBS_RELEASE) - } - export($${asspfx}._KEYS_) - - # reverse mapping for assignments on command line. - for (a, $${asspfx}._KEYS_) { - apfx = $${asspfx}.$${a} - ra = config.commandline.rev_assignments.$$eval($$apfx) - $$ra = $$a - export($$ra) - } -} - -defineReplace(qtGccSysrootifiedPath) { - return($$replace(1, ^=, $$[QT_SYSROOT])) -} - -defineReplace(qtGccSysrootifiedPaths) { - sysrootified = - for (path, 1): \ - sysrootified += $$qtGccSysrootifiedPath($$path) - return($$sysrootified) -} - -# libs-var, libs, in-paths -defineTest(qtConfResolveLibs) { - for (path, 3): \ - pre_lflags += -L$$path - $$1 = $$pre_lflags $$2 - export($$1) - return(true) -} - -# libs-var, in-paths, libs -defineTest(qtConfResolvePathLibs) { - ret = true - gcc: \ - local_paths = $$qtGccSysrootifiedPaths($$2) - else: \ - local_paths = $$2 - for (libdir, local_paths) { - !exists($$libdir/.) { - qtLog("Library path $$val_escape(libdir) is invalid.") - ret = false - } - } - !qtConfResolveLibs($$1, $$3, $$2): \ - ret = false - return($$ret) -} - -defineReplace(qtConfGetTestSourceList) { - result = - !isEmpty($${1}.test.inherit) { - base = $$section(1, ., 0, -2) - for (i, $${1}.test.inherit): \ - result += $$qtConfGetTestSourceList($${base}.$$i) - } - return($$result $$1) -} - -defineReplace(qtConfGetTestIncludes) { - defined($${1}._KEYS_, var) { - 1st = $$first($${1}._KEYS_) - equals(1st, 0) { - # array; recurse for every element - ret = - for (k, $${1}._KEYS_): \ - ret += $$qtConfGetTestIncludes($${1}.$$k) - return($$ret) - } - # object; try condition and recurse - !defined($${1}.headers, var):!defined($${1}.headers._KEYS_, var): \ # just plain broken without it - error("headers object '$$1' has no nested headers entry") - cond = $$eval($${1}.condition) - isEmpty(cond): \ # would be pointless otherwise - error("headers object '$$1' has no condition") - !$$qtConfEvaluate($$cond) { - qtLog("header entry '$$1' failed condition '$$cond'.") - return() - } - qtLog("header entry '$$1' passed condition.") - return($$qtConfGetTestIncludes($${1}.headers)) - } - return($$eval($$1)) # plain string - or nothing (can happen for top-level call only) -} - -# includes-var, in-paths, test-object-var -defineTest(qtConfResolvePathIncs) { - ret = true - gcc: \ - local_paths = $$qtGccSysrootifiedPaths($$2) - else: \ - local_paths = $$2 - for (incdir, local_paths) { - !exists($$incdir/.) { - qtLog("Include path $$val_escape(incdir) is invalid.") - ret = false - } - } - 2 -= $$QMAKE_DEFAULT_INCDIRS - $$1 = $$2 - export($$1) - wasm { - # FIXME: emcc downloads pre-built libraries and adds their include - # path to the clang call dynamically. it would be possible to parse - # the emcc -s USE_xyz=1 --cflags output to populate xzy_INCDIR and - # thus make the code below work. - return($$ret) - } - tests = $$qtConfGetTestSourceList($$3) - hdrs = - for (test, tests): \ - hdrs += $$qtConfGetTestIncludes($${test}.headers) - for (hdr, hdrs) { - h = $$qtConfFindInPathList($$hdr, $$2 $$EXTRA_INCLUDEPATH $$QMAKE_DEFAULT_INCDIRS) - isEmpty(h) { - qtLog("$$hdr not found in [$$val_escape(2)] and global paths.") - ret = false - } - } - return($$ret) -} - -# the library is specified inline in a 'libs' field. -# overrides from the command line are accepted. -defineTest(qtConfLibrary_inline) { - lib = $$eval($${1}.library) - !defined($${1}.libs, var):isEmpty($${1}.builds._KEYS_): \ - error("'inline' source in library '$$lib' specifies neither 'libs' nor 'builds'.") - - # library lists are specified as strings in the json sources for - # readability, but it's a pain to work with that, so expand it now. - eval($${1}.libs = $$eval($${1}.libs)) - export($${1}.libs) - for (b, $${1}.builds._KEYS_) { - eval($${1}.builds.$${b} = $$eval($${1}.builds.$${b})) - export($${1}.builds.$${b}) - } - - # if multiple libraries provide the same export, it makes sense - # to make them recognize the same input variables. - input = $$eval($${2}.alias) - - # build-specific direct libs. overwrites inline libs. - vars = - any = false - all = true - for (b, $$list(debug release)) { - iv = $${input}.libs.$${b} - vars += $$eval(config.commandline.rev_assignments.$${iv}) - defined(config.input.$${iv}, var) { - eval($${1}.builds.$${b} = $$eval(config.input.$${iv})) - export($${1}.builds.$${b}) - $${1}.builds._KEYS_ *= $${b} - any = true - } else { - all = false - } - } - $$any { - !$$all { - qtConfAddError("Either none or all of $$join(vars, ", ", [, ]) must be specified.") - return(false) - } - export($${1}.builds._KEYS_) - # we also reset the generic libs, to avoid surprises. - $${1}.libs = - export($${1}.libs) - } - - # direct libs. overwrites inline libs. - defined(config.input.$${input}.libs, var) { - eval($${1}.libs = $$eval(config.input.$${input}.libs)) - export($${1}.libs) - } - - includes = $$eval(config.input.$${input}.incdir) - - # prefix. prepends to (possibly overwritten) inline libs. - prefix = $$eval(config.input.$${input}.prefix) - !isEmpty(prefix) { - includes += $$prefix/include - $${1}.libs = -L$$prefix/lib $$eval($${1}.libs) - export($${1}.libs) - } - - libdir = $$eval(config.input.$${input}.libdir) - !isEmpty(libdir) { - libs = - for (ld, libdir): \ - libs += -L$$ld - $${1}.libs = $$libs $$eval($${1}.libs) - export($${1}.libs) - } - - !qtConfResolvePathIncs($${1}.includedir, $$includes, $$2): \ - return(false) - - return(true) -} - -# the library is provided by the qmake spec. -# this source type cannot fail. -defineTest(qtConfLibrary_makeSpec) { - spec = $$eval($${1}.spec) - isEmpty(spec): \ - error("makeSpec source in library '$$eval($${1}.library)' does not specify 'spec'.") - - !qtConfResolvePathLibs($${1}.libs, $$eval(QMAKE_LIBDIR_$$spec), $$eval(QMAKE_LIBS_$$spec)): \ - return(false) - - !qtConfResolvePathIncs($${1}.includedir, $$eval(QMAKE_INCDIR_$$spec), $$2): \ - return(false) - - !isEmpty(QMAKE_EXPORT_INCDIR_$$spec) { - $${1}.exportincludedir = $$eval(QMAKE_EXPORT_INCDIR_$$spec) - export($${1}.exportincludedir) - } - - # note that the object is re-exported, because we resolve the libraries. - - return(true) -} - -# the library is found via pkg-config. -defineTest(qtConfLibrary_pkgConfig) { - pkg_config = $$qtConfPkgConfig($$eval($${1}.host)) - isEmpty(pkg_config) { - qtLog("pkg-config use disabled globally.") - return(false) - } - args = $$qtConfPrepareArgs($$eval($${1}.args)) - - !qtConfPkgConfigPackageExists($$pkg_config, $$args) { - qtLog("pkg-config did not find package.") - return(false) - } - - qtRunLoggedCommand("$$pkg_config --modversion $$args", version)|return(false) - version ~= s/[^0-9.].*$// - $${1}.version = $$first(version) - export($${1}.version) - - qtRunLoggedCommand("$$pkg_config --libs-only-L $$args", libpaths)|return(false) - qtRunLoggedCommand("$$pkg_config --libs-only-l $$args", libs)|return(false) - eval(libs = $$libpaths $$libs) - !qtConfResolveLibs($${1}.libs, $$libs): \ - return(false) - contains($${1}.libs, ".*\\.$${QMAKE_EXTENSION_STATICLIB}$") { - qtRunLoggedCommand("$$pkg_config --static --libs $$args", libs)|return(false) - # Split by space - eval(libs = $$libs) - !qtConfResolveLibs($${1}.libs, $$libs): \ - return(false) - } - - qtRunLoggedCommand("$$pkg_config --cflags $$args", $${1}.cflags)|return(false) - # Split CFLAGS into stuff that goes into DEFINES, INCLUDEPATH, and other stuff. - # The compound variable is still set in case something wants to use it outside - # regular library exports. - defines = - includes = - ignored = - eval(cflags = $$eval($${1}.cflags)) - for (i, cflags) { - contains(i, "-I.*") { - i ~= s/^-I// - includes += $$i - } else: contains(i, "-D.*") { - i ~= s/^-D// - defines += $$i - } else { - # Sometimes, pkg-config files include other flags - # we really don't need and shouldn't add. - ignored += $$i - } - } - !isEmpty(ignored): \ - qtLog("Note: Dropped compiler flags '$$ignored'.") - !qtConfResolvePathIncs($${1}.includedir, $$includes, $$2): \ - return(false) - $${1}.defines = $$defines - - # now remove the content of the transitive deps we know about. - largs = $$qtConfAllLibraryArgs($$eval($${2}.dependencies)) - for (la, largs): \ - eval("$$la") - USES = $$eval($$list($$upper($$replace(QMAKE_USE, -, _)))) - # _CC == _LD for configure's library sources, so pick first arbitrarily. - DEPS = $$resolve_depends(USES, QMAKE_DEPENDS_, _CC) - for (DEP, DEPS) { - $${1}.libs -= $$eval(QMAKE_LIBS_$${DEP}) - $${1}.includedir -= $$eval(QMAKE_INCDIR_$${DEP}) - $${1}.defines -= $$eval(QMAKE_DEFINES_$${DEP}) - } - export($${1}.libs) - export($${1}.includedir) - export($${1}.defines) - - return(true) -} - -defineTest(qtConfTest_getPkgConfigVariable) { - pkg_config = $$qtConfPkgConfig($$eval($${1}.host)) - isEmpty(pkg_config): \ - return(false) - args = $$qtConfPrepareArgs($$eval($${1}.pkg-config-args)) - - !qtConfPkgConfigPackageExists($$pkg_config, $$args): \ - return(false) - - variable = $$eval($${1}.pkg-config-variable) - qtRunLoggedCommand("$$pkg_config --variable=$$variable $$args", $${1}.value)|return(false) - export($${1}.value) - $${1}.cache += value - export($${1}.cache) - return(true) -} - -defineReplace(qtConfLibraryArgs) { - NAME = $$upper($$replace($${1}.library, -, _)) - qmake_args = "QMAKE_LIBS_$${NAME} = $$val_escape($${1}.libs)" - for (b, $${1}.builds._KEYS_): \ - qmake_args += "QMAKE_LIBS_$${NAME}_$$upper($$b) = $$val_escape($${1}.builds.$${b})" - includedir = $$eval($${1}.includedir) - !isEmpty(includedir): \ - qmake_args += "QMAKE_INCDIR_$${NAME} = $$val_escape(includedir)" - defines = $$eval($${1}.defines) - !isEmpty(defines): \ - qmake_args += "QMAKE_DEFINES_$${NAME} = $$val_escape(defines)" - depends = $$eval($${2}.dependencies) - !isEmpty(depends) { - dep_uses = - for (use, depends): \ - dep_uses += $$section(use, :, 1, 1) - qmake_args += \ - "QMAKE_DEPENDS_$${NAME}_CC = $$upper($$replace(dep_uses, -, _))" \ - "QMAKE_DEPENDS_$${NAME}_LD = $$upper($$replace(dep_uses, -, _))" - } - return($$qmake_args) -} - -defineReplace(qtConfAllLibraryArgs) { - isEmpty(1): return() - dep_uses = - for (use, 1): \ - dep_uses += $$section(use, :, 1, 1) - dep_args = - seen = - for(ever) { - isEmpty(1): break() - use = $$take_last(1) - contains(seen, $$use): next() - seen += $$use - use_cfg = $$section(use, :, 0, 0) - !isEmpty(use_cfg) { - use_lib = $$section(use, :, 1, 1) - lpfx = $${use_cfg}.libraries.$$use_lib - dep_args += $$qtConfLibraryArgs($${lpfx}.sources.$$eval($${lpfx}.source), $$lpfx) - 1 += $$eval($${lpfx}.dependencies) - } - } - return("QMAKE_USE += $$dep_uses" $$dep_args) -} - -defineTest(qtConfExportLibrary) { - lpfx = $${currentConfig}.libraries.$$1 - alias = $$eval($${lpfx}.alias) - $${currentConfig}.found.$$alias = $$1 - export($${currentConfig}.found.$$alias) - name = $$eval($${lpfx}.export) - isEmpty(name): return() - spfx = $${lpfx}.sources.$$eval($${lpfx}.source) - !$$qtConfEvaluate($$eval($${spfx}.export)): return() - - output = privatePro - NAME = $$upper($$name) - # LIBS is emitted even if empty, as this allows the library to be "seen". - libs = $$eval($${spfx}.libs) - qtConfOutputVar(assign, $$output, QMAKE_LIBS_$$NAME, $$libs) - for (b, $${spfx}.builds._KEYS_) { - blibs = $$eval($${spfx}.builds.$${b}) - qtConfOutputVar(assign, $$output, QMAKE_LIBS_$${NAME}_$$upper($$b), $$blibs) - } - defines = $$eval($${spfx}.defines) - !isEmpty(defines): qtConfOutputVar(assign, $$output, QMAKE_DEFINES_$$NAME, $$defines) - includes = $$eval($${spfx}.exportincludedir) - !equals(includes, -) { - isEmpty(includes): includes = $$eval($${spfx}.includedir) - !isEmpty(includes): qtConfOutputVar(assign, $$output, QMAKE_INCDIR_$$NAME, $$includes) - } - uses = $$eval($${lpfx}.dependencies) - !isEmpty(uses) { - # FIXME: ideally, we would export transitive deps only for static - # libs, to not extend the link interface unduly. however, the system - # does currently not differentiate between public and private deps. - depends = - for (use, uses) { - use_cfg = $$section(use, :, 0, 0) - use_lib = $$section(use, :, 1, 1) - !isEmpty(use_cfg): \ - depends += $$upper($$eval($${use_cfg}.libraries.$${use_lib}.export)) - else: \ - depends += $$upper($$replace(use_lib, -, _)) - } - # we use suffixes instead of infixes, because $$resolve_depends() demands it. - qtConfOutputVar(assign, $$output, QMAKE_DEPENDS_$${NAME}_CC, $$depends) - qtConfOutputVar(assign, $$output, QMAKE_DEPENDS_$${NAME}_LD, $$depends) - } - !isEmpty($${currentConfig}.module): \ - qtConfExtendVar($$output, "QT.$${currentModule}_private.libraries", $$name) -} - -defineTest(qtConfHandleLibrary) { - lpfx = $${currentConfig}.libraries.$$1 - defined($${lpfx}.result, var): return() - - alias = $$eval($${lpfx}.alias) - !isEmpty($${currentConfig}.found.$$alias) { - # this happening indicates a logic error in the conditions - # of the feature(s) referring to this library. - # note that this does not look across module boundaries, as - # multiple modules may know the same libraries; de-duplication - # happens via the cache (obviously, this assumes identical - # definitions and logic). - error("A library exporting '$$alias' was already found.") - } - - qtConfEnsureTestTypeDeps("library") - !qtConfTestPrepare_compile($$lpfx) { - $${lpfx}.result = false - export($${lpfx}.result) - return() - } - $${lpfx}.dependencies = $$eval($${lpfx}.resolved_uses) - export($${lpfx}.dependencies) - - qtConfLoadResult($${lpfx}, $$1, "library") { - $$eval($${lpfx}.result): \ - qtConfExportLibrary($$1) - return() - } - - qtLogTestIntro($${lpfx}, "looking for library $${1}") - qtPersistLog() - - result = false - for (s, $${lpfx}.sources._KEYS_) { - spfx = $${lpfx}.sources.$${s} - - t = $$eval($${spfx}.type) - call = qtConfLibrary_$$t - !defined($$call, test): \ - error("Library $${1} source $${s} has unknown type '$$t'") - - qtLog("Trying source $$s (type $$t) of library $${1} ...") - - cond = $$eval($${spfx}.condition) - !$$qtConfEvaluate($$cond) { - qtLog(" => source failed condition '$$cond'.") - next() - } - - !$${call}($$spfx, $$lpfx) { - qtLog(" => source produced no result.") - next() - } - - $${lpfx}.source = $$s - export($${lpfx}.source) - - # if the library defines a test, use it to verify the source. - defined($${lpfx}.test, var)|defined($${lpfx}.test._KEYS_, var) { - $${lpfx}.resolved_uses = $$currentConfig:$$1 - $${lpfx}.host = $$eval($${spfx}.host) - !qtConfTest_compile($$lpfx) { - qtLog(" => source failed verification.") - next() - } - } - - qtLog(" => source accepted.") - - $${lpfx}.cache += source - for (v, $$list(libs includedir cflags version export)): \ - $${lpfx}.cache += sources.$${s}.$${v} - for (b, $${spfx}.builds._KEYS_): \ - $${lpfx}.cache += sources.$${s}.builds.$${b} - - # immediately output the library as well. - qtConfExportLibrary($$1) - - result = true - break() - } - - $${lpfx}.msgs = $$qtPersistedLog() - export($${lpfx}.msgs) - - qtLogTestResult($${lpfx}, $$result) - - $${lpfx}.result = $$result - export($${lpfx}.result) - qtConfSaveResult($${lpfx}, $$1) -} - -# This is a fake test type for the test dependency system. -defineTest(qtConfTest_library) { - error("The test type 'library' may not be instantiated.") -} - -defineTest(qtConfTestPrepare_compile) { - !isEmpty($${1}.use._KEYS_) { - uses = - for (k, $${1}.use._KEYS_) { - use = $$eval($${1}.use.$${k}.lib) - isEmpty(use): \ - error("'use' entry $$k in test $$1 lacks 'lib' field.") - !$$qtConfEvaluate($$eval($${1}.use.$${k}.condition)): \ - next() - uses += $$use - } - } else { - uses = $$split($${1}.use) - } - for (u, uses) { - libConfig = - exports = $$eval($${currentConfig}.exports.$$u) - !isEmpty(exports) { - # using a local library by exported name. - ru = $$eval($${currentConfig}.found.$$u) - !isEmpty(ru) { - # if it was already found, all is good. - u = $$ru - } else: count(exports, 1) { - # otherwise, if there is only one option, ensure it's resolved. - u = $$exports - qtConfHandleLibrary($$u) - } else { - # otherwise, verify that all options were resolved. - for (x, exports) { - isEmpty($${currentConfig}.libraries.$${x}.result) { - # the higher-level logic is in the features, which we cannot - # infer from here. so the only option is failing. - error("Test $$1 refers to yet unresolved library export '$$u'") - } - } - return(false) - } - libConfig = $$currentConfig - } else: contains($${currentConfig}.libraries._KEYS_, $$u) { - # using a local library by real name. this should be the exception. - qtConfHandleLibrary($$u) - libConfig = $$currentConfig - } else { - for (d, QMAKE_LIBRARY_DEPS) { - exports = $$eval($${d}.exports.$$u) - !isEmpty(exports) { - # using a foreign library by exported name. - # foreign libraries may be external (if they are from a different - # repository and the build is modular), and using these by real - # name is impossible. so for consistency, uses by real name are - # limited to local libraries. - ru = $$eval($${d}.found.$$u) - !isEmpty(ru) { - u = $$ru - libConfig = $$d - break() - } - for (x, exports) { - isEmpty($${d}.libraries.$${x}.result): \ - error("Test $$1 refers to unresolved library export '$$u' in '$$d'") - } - return(false) - } - } - } - isEmpty(libConfig) { - nu = $$upper($$replace(u, -, _)) - !defined(QMAKE_LIBS_$$nu, var): \ - error("Test $$1 tries to use undeclared library '$$u'") - # using an external library by exported name. - $${1}.resolved_uses += :$$u - } else { - lpfx = $${libConfig}.libraries.$${u} - !equals($${lpfx}.result, true): \ - return(false) - $${1}.resolved_uses += $$libConfig:$$u - } - } - export($${1}.resolved_uses) - return(true) -} - -defineTest(qtConfPrepareCompileTestSource) { - test_dir = $$2 - - tests = $$qtConfGetTestSourceList($$1) - - test_lang = "c++" - for (test, tests): \ - test_lang += $$eval($${test}.test.lang) - test_lang = $$last(test_lang) # Last non-empty, that is. - - equals(test_lang, "c++"): suffix = "cpp" - else: equals(test_lang, "c"): suffix = "c" - else: equals(test_lang, "objc"): suffix = "m" - else: equals(test_lang, "objc++"): suffix = "mm" - else: error("Unknown language '$$test_lang' in compile test $$1") - - # Create source code - contents = "/* Generated by configure */" - # Custom code before includes - for (test, tests): \ - for (ent, $$qtConfScalarOrList($${test}.test.head)): \ - contents += $$ent - # Includes - for (test, tests) { - hdrs = $$qtConfGetTestIncludes($${test}.test.include) - isEmpty(hdrs): \ - hdrs = $$qtConfGetTestIncludes($${test}.headers) - for (ent, hdrs): \ - contents += "$${LITERAL_HASH}include <$$ent>" - } - # Custom code after includes - for (test, tests): \ - for (ent, $$qtConfScalarOrList($${test}.test.tail)): \ - contents += $$ent - # And finally the custom code inside main() - contents += \ - "int main(int argc, char **argv)" \ - "{" \ - " (void)argc; (void)argv;" \ - " /* BEGIN TEST: */" - for (test, tests): \ - for (ent, $$qtConfScalarOrList($${test}.test.main)): \ - contents += " $$ent" - contents += \ - " /* END TEST */" \ - " return 0;" \ - "}" - write_file($$test_dir/main.$$suffix, contents)|error() - - for (test, tests) { - for (file, $$qtConfScalarOrList($${test}.test.files._KEYS_)): \ - write_file($$test_dir/$$file, $$qtConfScalarOrList($${test}.test.files.$${file}))|error() - } - - # Create stub .pro file - contents = "SOURCES = main.$$suffix" - # Custom project code - pwd = $$val_escape($${currentConfig}.dir) - for (test, tests): \ - for (ent, $$qtConfScalarOrList($${test}.test.qmake)): \ - contents += $$replace(ent, "@PWD@", $$pwd) - write_file($$test_dir/$$basename(test_dir).pro, contents)|error() -} - -defineTest(qtConfTest_compile) { - test = $$eval($${1}.test) - host = $$eval($${1}.host) - isEmpty(host): host = false - - test_base_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR) - isEmpty(test) { - test_dir = $$test_base_out_dir/$$section(1, ".", -1) - test_out_dir = $$test_dir - qtConfPrepareCompileTestSource($$1, $$test_dir) - } else { - test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test - test_out_dir = $$test_base_out_dir/$$test - !isEmpty($${1}.pro): \ - test_dir = $$test_dir/$$eval($${1}.pro) - } - test_cmd_base = "$$QMAKE_CD $$system_quote($$system_path($$test_out_dir)) &&" - - qmake_args = $$qtConfPkgConfigEnv()$$system_quote($$system_path($$QMAKE_QMAKE)) - !isEmpty(QMAKE_QTCONF): \ - qmake_args += -qtconf $$system_quote($$QMAKE_QTCONF) - - # Disable qmake features which are typically counterproductive for tests - qmake_args += "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" - - # allow tests to behave differently depending on the type of library - # being built (shared/static). e.g. see config.tests/unix/icu - shared: \ - qmake_configs = "shared" - else: \ - qmake_configs = "static" - - use_bfd_linker: \ - qmake_configs += "use_bfd_linker" - use_gold_linker: \ - qmake_configs += "use_gold_linker" - use_lld_linker: \ - qmake_configs += "use_lld_linker" - - # disable warnings from the builds, since they're just noise at this point. - qmake_configs += "warn_off" - - # add console to the CONFIG variable when running the tests, so that they - # can work with a regular main() entry point on Windows. - qmake_configs += "console" - - # for platforms with multiple architectures (macOS, iOS, tvOS, watchOS), - # make sure tests are only built for a single architecture - qmake_configs += "single_arch" - - qmake_args += "\"CONFIG += $$qmake_configs\"" - - !$$host|!cross_compile { - # add compiler flags, these are set for the target and should not be applied to host tests - !isEmpty(EXTRA_DEFINES): \ - qmake_args += $$system_quote(DEFINES += $$val_escape(EXTRA_DEFINES)) - !isEmpty(EXTRA_LIBDIR): \ - qmake_args += $$system_quote(QMAKE_LIBDIR += $$val_escape(EXTRA_LIBDIR)) - !isEmpty(EXTRA_FRAMEWORKPATH): \ - qmake_args += $$system_quote(QMAKE_FRAMEWORKPATH += $$val_escape(EXTRA_FRAMEWORKPATH)) - !isEmpty(EXTRA_INCLUDEPATH): \ - qmake_args += $$system_quote(INCLUDEPATH += $$val_escape(EXTRA_INCLUDEPATH)) - qmake_args += $$EXTRA_QMAKE_ARGS - } - - # make sure to make this the last override (because of -early) - cross_compile { - # must be done before loading default_pre.prf. - qmake_args += -early "\"CONFIG += cross_compile\"" - } - - # Clean up after previous run - exists($$test_out_dir/Makefile): \ - QMAKE_MAKE = "$$QMAKE_MAKE clean && $$QMAKE_MAKE" - - mkpath($$test_out_dir)|error() - cont = "CONFIG += QTDIR_build" - write_file($$test_base_out_dir/.qmake.cache, cont)|error() - - $${1}.literal_args += $$qtConfAllLibraryArgs($$eval($${1}.resolved_uses)) - - # add possible command line args - qmake_args += \ - $$qtConfPrepareArgs($$eval($${1}.args)) \ - $$qtSystemQuote($$eval($${1}.literal_args)) - - qtRunLoggedCommand("$$test_cmd_base $$qmake_args $$system_quote($$test_dir)") { - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE"): \ - return(true) - } - - return(false) -} - -defineTest(qtConfTest_files) { - for(i, $${1}.files._KEYS_) { - f = $$eval($${1}.files.$${i}) - qtLog("Searching for file $${f}.") - contains(f, ".*\\.h") { - file = $$qtConfFindInPathList($$f, $$EXTRA_INCLUDEPATH $$QMAKE_DEFAULT_INCDIRS) - } else: contains(f, ".*\\.(lib|so|a)") { - file = $$qtConfFindInPathList($$f, $$EXTRA_LIBDIR $$QMAKE_DEFAULT_LIBDIRS) - } else { - # assume we're looking for an executable - file = $$qtConfFindInPath($$f, $$EXTRA_PATH) - } - isEmpty(file) { - qtLog(" Not found."); - return(false) - } - qtLog(" Found at $${file}.") - } - return(true) -} - -defineTest(logn) { - log("$${1}$$escape_expand(\\n)") -} - -defineTest(qtLogTestIntro) { - label = $$eval($${1}.label) - isEmpty(label): return() - - isEmpty(3): log("Checking for $${label}... ") - $$QMAKE_CONFIG_VERBOSE: log("$$escape_expand(\\n)") - write_file($$QMAKE_CONFIG_LOG, 2, append) -} - -defineTest(qtLogTestResult) { - isEmpty($${1}.label): return() - - !isEmpty($${1}.log) { - field = $$eval($${1}.log) - log_msg = $$eval($${1}.$$field) - msg = "test $$1 gave result $$log_msg" - } else: $${2} { - log_msg = yes - msg = "test $$1 succeeded" - } else { - log_msg = no - msg = "test $$1 FAILED" - } - $$QMAKE_CONFIG_VERBOSE: log_msg = $$msg - isEmpty(3): logn("$$log_msg") - write_file($$QMAKE_CONFIG_LOG, msg, append) -} - -defineTest(qtConfSaveResult) { - equals($${1}.cache, -): \ - return() - keys = result msgs $$eval($${1}.cache) - cont = "cache.$${2}._KEYS_ = $$keys" - cache.$${2}._KEYS_ = $$keys - export(cache.$${2}._KEYS_) - for (k, keys) { - cont += "cache.$${2}.$${k} = $$val_escape($${1}.$${k})" - cache.$${2}.$${k} = $$eval($${1}.$${k}) - export(cache.$${2}.$${k}) - } - write_file($$QMAKE_CONFIG_CACHE, cont, append)|error() -} - -defineTest(qtConfLoadResult) { - equals(QMAKE_CONFIG_CACHE_USE, none): \ - return(false) - isEmpty(cache.$${2}._KEYS_): \ - return(false) - equals(QMAKE_CONFIG_CACHE_USE, positive):!$$eval(cache.$${2}.result): \ - return(false) - for (k, cache.$${2}._KEYS_) { - $${1}.$${k} = $$eval(cache.$${2}.$${k}) - export($${1}.$${k}) - } - # we could print the cached result, but that's basically just noise - - # the explicitly generated summary is supposed to contain all relevant - # information. - qtLogTestIntro($$1, "loaded result for $$3 $$1", false) - qtLog($$eval($${1}.msgs)) - qtLogTestResult($$1, $$eval($${1}.result), false) - return(true) -} - -defineTest(qtConfIsBoolean) { - equals(1, "true")|equals(1, "false"): \ - return(true) - return(false) -} - -defineTest(qtConfSetupTestTypeDeps) { - for (tt, $${currentConfig}.testTypeDependencies._KEYS_) { - !defined(qtConfTest_$${tt}, test): \ - error("Declaring dependency for undefined test type '$$tt'.") - for (f, $${currentConfig}.testTypeDependencies.$${tt}._KEYS_) { - feature = $$eval($${currentConfig}.testTypeDependencies.$${tt}.$${f}) - isEmpty($${currentConfig}.features.$${feature}._KEYS_): \ - error("Test type '$$tt' depends on undefined feature '$$feature'.") - } - } - # Test type aliasing means that one test type's callback is called by - # another test type's callback. Put differently, one callback forwards - # the call to another one. The former representation is more natural - # (and concise) to write, while the latter is more efficient to process. - # Hence, this function inverts the mapping. - for (tt, $${currentConfig}.testTypeAliases._KEYS_) { - !defined(qtConfTest_$${tt}, test): \ - error("Aliasing undefined test type '$$tt'.") - for (tta, $${currentConfig}.testTypeAliases.$${tt}._KEYS_) { - type = $$eval($${currentConfig}.testTypeAliases.$${tt}.$${tta}) - !defined(qtConfTest_$${type}, test): \ - error("Aliasing '$$tt' to undefined test type '$$type'.") - $${currentConfig}.testTypeForwards.$${type} += $$tt - export($${currentConfig}.testTypeForwards.$${type}) - } - } -} - -defineTest(qtConfEnsureTestTypeDepsOne) { - depsn = $${currentConfig}.testTypeDependencies.$${1}._KEYS_ - !isEmpty($$depsn) { - for (dep, $$depsn) { - feature = $$eval($${currentConfig}.testTypeDependencies.$${1}.$${dep}) - !qtConfCheckFeature($$feature): \ - error("Test type '$$1' depends on non-emitted feature $${feature}.") - } - $$depsn = - export($$depsn) - } - fwdsn = $${currentConfig}.testTypeForwards.$${1} - !isEmpty($$fwdsn) { - for (fwd, $$fwdsn): \ - qtConfEnsureTestTypeDepsOne($$fwd) - $$fwdsn = - export($$fwdsn) - } -} - -defineTest(qtConfEnsureTestTypeDeps) { - qtConfEnsureTestTypeDepsOne($$1) - currentConfig = config.builtins - qtConfEnsureTestTypeDepsOne($$1) -} - -defineTest(qtRunSingleTest) { - tpfx = $${currentConfig}.tests.$${1} - defined($${tpfx}.result, var): \ - return() - - type = $$eval($${tpfx}.type) - call = "qtConfTest_$$type" - !defined($$call, test): \ - error("Configure test $${1} refers to nonexistent type $$type") - - qtConfEnsureTestTypeDeps($$type) - - preCall = "qtConfTestPrepare_$$type" - defined($$preCall, test):!$${preCall}($${tpfx}) { - $${tpfx}.result = false - export($${tpfx}.result) - # don't cache the result; the pre-deps have their own caches. - return() - } - - # note: we do this only after resolving the dependencies and the - # preparation (which may resolve libraries), so that caching does - # not alter the execution order (and thus the output). - qtConfLoadResult($${tpfx}, $$1, "config test"): \ - return() - - qtLogTestIntro($${tpfx}, "executing config test $${1}") - qtPersistLog() - - result = false - $${call}($${tpfx}): result = true - - $${tpfx}.msgs = $$qtPersistedLog() - export($${tpfx}.msgs) - - qtLogTestResult($${tpfx}, $$result) - - $${tpfx}.result = $$result - export($${tpfx}.result) - qtConfSaveResult($${tpfx}, $$1) -} - -defineTest(qtConfHaveModule) { - module = $$replace(1, -, _) - !isEmpty(QT.$${module}.skip):$$eval(QT.$${module}.skip): \ - return(false) - !isEmpty(QT.$${module}.name): \ - return(true) - return(false) -} - -defineReplace(qtConfEvaluate) { - isEmpty(1): return(true) - - 1 ~= s/$$escape_expand(\\t)/ /g - 1 ~= s/$$escape_expand(\\r)//g - 1 ~= s/$$escape_expand(\\n) */ /g - expr = $${1} - expr ~= s/&&/ && /g - expr ~= s/\\|\\|/ || /g - expr ~= s/!/ ! /g - expr ~= s/\\(/ ( /g - expr ~= s/\\)/ ) /g - expr ~= s/ *== */==/g - expr ~= s/ *! = */!=/g - expr_list = $$eval($$list($$expr)) - return($$qtConfEvaluateSubExpression($${1}, $$expr_list, 0)) -} - -defineReplace(qtConfEvaluateSingleExpression) { - e = $${2} - - equals(e, true) { - result = true - } else: equals(e, false) { - result = false - } else: contains(e, "^[0-9]+$") { - # numbers - result = $$e - } else: contains(e, "^'.*'$") { - # quoted literals - result = $$replace(e, "^'(.*)'$", "\\1") - } else: contains(e, "^tests\\..*") { - !qt_conf_tests_allowed: \ - error("Expression '$${1}' refers to a test, which is not allowed at this stage of configuring.") - test = $$section(e, ".", 1, 1) - var = $$section(e, ".", 2, -1) - isEmpty(var): \ - var = result - !contains($${currentConfig}.tests._KEYS_, $$test): \ - error("Unknown test object $${test} in expression '$${1}'.") - qtRunSingleTest($$test) - result = $$eval($${currentConfig}.tests.$${test}.$${var}) - } else: contains(e, "^libs\\..*") { - !qt_conf_tests_allowed: \ - error("Expression '$${1}' refers to a library, which is not allowed at this stage of configuring.") - lib = $$section(e, ".", 1, 1) - var = $$section(e, ".", 2, -1) - isEmpty(var): \ - var = result - !contains($${currentConfig}.libraries._KEYS_, $$lib): \ - error("Unknown library object $${lib} in expression '$${1}'.") - qtConfHandleLibrary($$lib) - !defined($${currentConfig}.libraries.$${lib}.$${var}, var): \ - var = sources.$$eval($${currentConfig}.libraries.$${lib}.source).$$var - result = $$eval($${currentConfig}.libraries.$${lib}.$${var}) - } else: contains(e, "^features\\..*") { - feature = $$section(e, ".", 1, 1) - var = $$section(e, ".", 2, -1) - isEmpty(var): \ - var = available - !contains($${currentConfig}.features._KEYS_, $$feature) { - # this is basically a copy of what qtConfig() in qt_build_config.prf - # does, but we produce a nicer error message. - for (module, QMAKE_CONFIG_DEPS) { - contains(QT.$${module}.enabled_features, $$feature): \ - result = true - else: contains(QT.$${module}.disabled_features, $$feature): \ - result = false - else: \ - next() - !equals(var, available): \ - error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") - return($$result) - } - error("Unknown feature object $${feature} in expression '$${1}'.") - } - !qtConfCheckFeature($$feature): \ - error("Expression '$$1' is accessing non-emitted feature $${feature}.") - result = $$eval($${currentConfig}.features.$${feature}.$${var}) - } else: contains(e, "^config\\..*") { - var = $$replace(e, "^config\\.", "") - result = false - contains(CONFIG, $$var): result = true - } else: contains(e, "^module\\..*") { - var = $$replace(e, "^module\\.", "") - result = false - qtConfHaveModule($$var): result = true - } else: contains(e, "^arch\\..*") { - var = $$replace(e, "^arch\\.", "") - result = false - isEmpty(QT_ARCH): \ - qtConfCheckFeature(architecture) - contains(QT_ARCH, $$var): result = true - } else: contains(e, "^subarch\\..*") { - var = $$replace(e, "^subarch\\.", "") - result = false - isEmpty(QT_ARCH): \ - qtConfCheckFeature(architecture) - contains(QT_CPU_FEATURES.$$QT_ARCH, $$var): result = true - } else: contains(e, "^input\\..*") { - result = $$eval(config.$$e) - } else: contains(e, "^var\\..*") { - var = $$replace(e, "^var\\.", "") - result = $$eval($$var) - } else: contains(e, "^call\\..*") { - call = $$replace(e, "^call\\.", "qtConfFunc_") - !defined($$call, replace): \ - error("Call $$call referenced in expression '$${1}' does not exist") - eval(result = \$\$"$$call"()) - } else { - error("Unrecognized token $$e in expression '$${1}'") - } - return($$result) -} - -defineReplace(qtConfEvaluateSubExpression) { - expr_list = $${2} - result = true - negate = false - runSubExpression = false - nesting_level = 0 - for (n, $${3}..$$num_add($$size(expr_list), -1)) { - e = $$member(expr_list, $$n) - $$runSubExpression { - runSubExpression = false - result = $$qtConfEvaluateSubExpression($${1}, $$expr_list, $$n) - } else: isEqual(e, "(") { - isEqual(nesting_level, 0): runSubExpression = true - nesting_level = $$num_add($$nesting_level, 1) - next() - } else: isEqual(e, ")") { - nesting_level = $$num_add($$nesting_level, -1) - lessThan(nesting_level, 0): break() - next() - } else: greaterThan(nesting_level, 0) { - next() - } else: isEqual(e, "!") { - negate = true - next() - } else: isEqual(e, "&&") { - !qtConfIsBoolean($$result): \ - error("Left hand side of && is non-boolean value '$$result' in expression '$${1}'") - !$$result: return(false) - } else: isEqual(e, "||") { - !qtConfIsBoolean($$result): \ - error("Left hand side of || is non-boolean value '$$result' in expression '$${1}'") - $$result: return(true) - } else { - contains(e, ".*==.*") { - lhs = $$qtConfEvaluateSingleExpression($${1}, $$replace(e, "==.*", "")) - rhs = $$qtConfEvaluateSingleExpression($${1}, $$replace(e, ".*==", "")) - result = false - equals(lhs, $$rhs): result = true - } else: contains(e, ".*!=.*") { - lhs = $$qtConfEvaluateSingleExpression($${1}, $$replace(e, "!=.*", "")) - rhs = $$qtConfEvaluateSingleExpression($${1}, $$replace(e, ".*!=", "")) - result = false - !equals(lhs, $$rhs): result = true - } else { - result = $$qtConfEvaluateSingleExpression($${1}, $$e) - } - } - $$negate { - !qtConfIsBoolean($$result): \ - error("Attempting to negate a non-boolean value '$$result' in expression '$${1}'") - $$result: \ - result = false - else: \ - result = true - negate = false - } - } - return($$result) -} - -defineReplace(qtIsFeatureEnabled) { - enable = $$eval($${currentConfig}.features.$${1}.enable) - !isEmpty(enable) { - $$qtConfEvaluate($$enable): \ - return(true) - } else { - equals(config.input.$${1}, "yes"): \ - return(true) - } - - return(false) -} - -defineReplace(qtIsFeatureDisabled) { - disable = $$eval($${currentConfig}.features.$${1}.disable) - !isEmpty(disable) { - $$qtConfEvaluate($$disable): \ - return(true) - } else { - equals(config.input.$${1}, "no"): \ - return(true) - } - - return(false) -} - -defineReplace(qtConfCheckSingleCondition) { - result = $$qtConfEvaluate($$2) - - !qtConfIsBoolean($$result): \ - error("Evaluation of condition '$$2' yielded non-boolean value '$$result' in feature '$${1}'.") - - !$$result { - $${3} { - qtConfAddError("Feature '$${1}' was enabled, but the pre-condition '$$2' failed.", log) - $$result = true - } - } - return($$result) -} - -defineTest(qtConfCheckFeature) { - fpfx = $${currentConfig}.features.$${1} - - available = $$eval($${fpfx}.available) - !isEmpty(available): return(true) - - # skip features that will not get emitted anyway - emitIf = $$qtConfEvaluate($$eval($${fpfx}.emitIf)) - enabled = $$qtIsFeatureEnabled($$1) - disabled = $$qtIsFeatureDisabled($$1) - - !$$emitIf { - $$enabled|$$disabled: \ - qtConfAddWarning("Feature $${1} is insignificant in this configuration, ignoring related command line option(s).") - return(false) - } - - $$disabled { - result = false - } else: !$$enabled:!$$qtConfEvaluate($$eval($${fpfx}.autoDetect)) { - # feature not auto-detected and not explicitly enabled - result = false - } else { - result = true - for (condition, $$qtConfScalarOrList($${fpfx}.condition)) { - result = $$qtConfCheckSingleCondition($$1, $$condition, $$enabled) - !$$result: break() - } - } - $${fpfx}.available = $$result - export($${fpfx}.available) - - for (i, $${fpfx}.output._KEYS_): \ - qtConfProcessOneOutput($${1}, $$i) - - return(true) -} - -defineTest(qtConfCheckModuleCondition) { - QT.$${currentModule}.skip = false - !$$qtConfEvaluate($$eval($${currentConfig}.condition)): \ - QT.$${currentModule}.skip = true - export(QT.$${currentModule}.skip) - - # ensure qtConfHaveModule() works - QT.$${currentModule}.name = - - export(QT.$${currentModule}.name) -} - - -defineTest(qtConfProcessFeatures) { - for (feature, $${currentConfig}.features._KEYS_): \ - qtConfCheckFeature($$feature) -} - -# -# reporting -# - -defineReplace(qtConfPadCols) { - pad = $$num_add($$str_size($$2), -$$str_size($${1})) - lessThan(pad, 0): pad = 0 - return("$$1 $$str_member($$2, 0, $$pad) $$3") -} - -defineTest(qtConfReportPadded) { - qtConfAddReport($$qtConfPadCols($$1, "........................................", $$2)) -} - -defineReplace(qtConfCollectFeatures) { - l = - for (feature, $$list($${1})) { - $$eval($${currentConfig}.features.$${feature}.available): \ - l += $$eval($${currentConfig}.features.$${feature}.label) - } - - isEmpty(l): return("<none>") - return($$join(l, ' ')) -} - -defineTest(qtConfReport_featureList) { - qtConfReportPadded($${1}, $$qtConfCollectFeatures($${2})) -} - -defineReplace(qtConfFindFirstAvailableFeature) { - for (feature, $$list($${1})) { - isEmpty($${currentConfig}.features.$${feature}._KEYS_): \ - error("Asking for a report on undefined feature $${2}.") - $$eval($${currentConfig}.features.$${feature}.available): \ - return($$eval($${currentConfig}.features.$${feature}.label)) - } - - return("<none>") -} - -defineTest(qtConfReport_firstAvailableFeature) { - qtConfReportPadded($${1}, $$qtConfFindFirstAvailableFeature($${2})) -} - -defineTest(qtConfReport_feature) { - !contains($${currentConfig}.features._KEYS_, $$2): \ - error("Asking for a report on undefined feature $${2}.") - - # hide report for not emitted features - isEmpty($${currentConfig}.features.$${2}.available): \ - return() - - $$eval($${currentConfig}.features.$${2}.available) { - result = "yes" - !isEmpty(3): result = "$${3}" - } else { - result = "no" - !isEmpty(4): result = "$${4}" - } - - text = $$eval($${currentConfig}.features.$${2}.label) - - qtConfReportPadded($${1}$$text, $$result) -} - -defineTest(qtConfReport_note) { - qtConfAddNote($${1}) -} - -defineTest(qtConfReport_warning) { - qtConfAddWarning($${1}) -} - -defineTest(qtConfReport_error) { - qtConfAddError($${1}, log) -} - -defineTest(qtConfReport_fatal) { - qtConfFatalError($${1}) -} - -defineTest(qtConfCreateReportRecurse) { - equals(2, false) { - indent = "" - recurse = false - } else { - indent = $${2} - recurse = true - } - - keys = $$eval($${1}._KEYS_) - for (n, keys) { - entry = $${1}.$$n - subKeys = $$eval($${entry}._KEYS_) - contains(subKeys, condition) { - r = true - for (condition, $$qtConfScalarOrList($${entry}.condition)) { - r = $$qtConfEvaluate($$condition) - !$$r: break() - } - !qtConfIsBoolean($$r): \ - error("Evaluation of condition '$$condition' in report entry $${entry} yielded non-boolean value '$$r'.") - !$$r: next() - } - contains(subKeys, "section") { - !$$recurse: \ - error("Report type 'section' is not allowed in '$$1'.") - section = $$eval($${entry}.section) - qtConfAddReport("$$indent$$section:") - qtConfCreateReportRecurse("$${entry}.entries", "$$indent ") - } else: !isEmpty($${entry}) { - feature = $$eval($${entry}) - qtConfReport_feature($$indent, $$feature) - } else { - text = $$eval($${entry}.message) - isEmpty($${entry}.type): \ - error("Report entry $${entry} doesn't define a type.") - r = "qtConfReport_$$eval($${entry}.type)" - !defined($$r, test): \ - error("Undefined report type $$eval($${entry}.type) used in report entry $${entry}.") - args = $$eval($${entry}.args) - $${r}($$indent$${text}, $$args) - } - } -} - -defineTest(qtConfProcessEarlyChecks) { - qtConfCreateReportRecurse($${currentConfig}.earlyReport, false) -} - -defineTest(qtConfCreateReport) { - qtConfCreateReportRecurse($${currentConfig}.report, false) -} - -defineTest(qtConfCreateSummary) { - qtConfCreateReportRecurse($${currentConfig}.summary, "") -} - -defineTest(qtConfPrintReport) { - blocks = \ - "$$join(QT_CONFIGURE_REPORT, $$escape_expand(\\n))" \ - "$$join(QT_CONFIGURE_NOTES, $$escape_expand(\\n\\n))" \ - "$$join(QT_CONFIGURE_WARNINGS, $$escape_expand(\\n\\n))" - - !isEmpty(QT_CONFIGURE_ERRORS) { - blocks += "$$join(QT_CONFIGURE_ERRORS, $$escape_expand(\\n\\n))" - mention_config_log:!$$QMAKE_CONFIG_VERBOSE: \ - blocks += "Check config.log for details." - } - blocks = "$$join(blocks, $$escape_expand(\\n\\n))" - logn($$blocks) - !isEmpty(QT_CONFIGURE_ERRORS):!equals(config.input.continue, yes): \ - error() - write_file($$OUT_PWD/config.summary, blocks)|error() -} - -defineTest(qtConfCheckErrors) { - !isEmpty(QT_CONFIGURE_ERRORS):!equals(config.input.continue, yes): \ - qtConfPrintReport() -} - -# -# output generation -# - -defineTest(qtConfOutput_libraryPaths) { - qtLog("Global lib dirs: [$$val_escape(EXTRA_LIBDIR)] [$$val_escape(QMAKE_DEFAULT_LIBDIRS)]") - qtLog("Global inc dirs: [$$val_escape(EXTRA_INCLUDEPATH)] [$$val_escape(QMAKE_DEFAULT_INCDIRS)]") -} - -# qtConfOutputVar(modifier, output, name, value) -defineTest(qtConfOutputVar) { - modifier = $$1 - output = $$2 - name = $$3 - value = $$val_escape(4) - - defined($${currentConfig}.output.$${output}.assign.$${name}, var): \ - error("Trying to overwrite assigned variable '$$name' in '$$output' using modifier '$$modifier'.") - - equals(modifier, assign) { - !isEmpty($${currentConfig}.output.$${output}.append.$${name})|!isEmpty($${currentConfig}.output.$${output}.remove.$${name}): \ - error("Trying to assign variable '$$name' in '$$output', which has already appended or removed parts.") - $${currentConfig}.output.$${output}.assign.$${name} = $$value - } else: equals(modifier, append) { - contains($${currentConfig}.output.$${output}.remove.$${name}, $$value): \ - error("Trying to append removed '$$value' to variable '$$name' in '$$output'.") - $${currentConfig}.output.$${output}.append.$${name} += $$value - } else: equals(modifier, remove) { - contains($${currentConfig}.output.$${output}.append.$${name}, $$value): \ - error("Trying to remove appended '$$value' to variable '$$name' in '$$output'.") - $${currentConfig}.output.$${output}.remove.$${name} += $$value - } else { - error("Invalid modifier '$$modifier' passed to qtConfOutputVar.") - } - $${currentConfig}.output.$${output}.$${modifier}._KEYS_ *= $${name} - export($${currentConfig}.output.$${output}.$${modifier}.$${name}) - export($${currentConfig}.output.$${output}.$${modifier}._KEYS_) -} - -# qtConfExtendVar(output, name, value) -defineTest(qtConfExtendVar) { - output = $$1 - name = $$2 - value = $$val_escape(3) - - !defined($${currentConfig}.output.$${output}.assign.$${name}, var): \ - error("Trying to extend undefined variable '$$name' in '$$output'.") - - $${currentConfig}.output.$${output}.assign.$${name} += $$value - export($${currentConfig}.output.$${output}.assign.$${name}) -} - -defineTest(qtConfOutputVarHelper) { - !isEmpty($${2}.public):$$eval($${2}.public) { - output = "publicPro" - } else { - output = "privatePro" - } - - negative = $$eval($${2}.negative) - isEmpty(negative): negative = false - equals(3, $$negative): return() - - name = $$eval($${2}.name) - isEmpty(name): \ - error("Output type 'var$$title($$1)' used in feature '$$eval($${2}.feature)' without a 'name' entry.") - - value = $$qtConfEvaluate($$eval($${2}.value)) - !isEmpty($${2}.eval):$$qtConfEvaluate($$eval($${2}.eval)): \ - eval(value = $$value) - qtConfOutputVar($$1, $$output, $$name, $$value) - equals(output, "publicPro"):!isEmpty($${currentConfig}.module): \ - qtConfExtendVar($$output, "QT.$${currentModule}.exports", $$name) -} - -defineTest(qtConfOutput_varAssign) { - qtConfOutputVarHelper(assign, $$1, $$2) -} - -defineTest(qtConfOutput_varAppend) { - qtConfOutputVarHelper(append, $$1, $$2) -} - -defineTest(qtConfOutput_varRemove) { - qtConfOutputVarHelper(remove, $$1, $$2) -} - -defineTest(qtConfOutputConfigVar) { - pro = $$3 - var = $$4 - modular = $$5 - - negative = $$eval($${1}.negative) - isEmpty(negative): negative = false - equals(2, $$negative): return() - - val = $$eval($${1}.name) - isEmpty(val) { - val = $$eval($${1}.feature) - $$negative: val = no-$$val - } - - isEmpty($${currentConfig}.module)|!$$modular: \ - qtConfOutputVar(append, $$pro, $$var, $$val) - else: \ - qtConfExtendVar($$pro, "QT.$${currentModule}.$$var", $$val) -} - -defineTest(qtConfOutput_publicQtConfig) { - qtConfOutputConfigVar($$1, $$2, "publicPro", "QT_CONFIG", true) -} - -defineTest(qtConfOutput_publicConfig) { - !isEmpty($${currentConfig}.module): \ - error("Cannot use output type 'publicConfig' in module-local feature '$$eval($${1}.feature)'.") - qtConfOutputConfigVar($$1, $$2, "publicPro", "CONFIG", false) -} - -defineTest(qtConfOutput_privateConfig) { - qtConfOutputConfigVar($$1, $$2, "privatePro", "CONFIG", false) -} - -defineTest(qtConfOutputSetDefine) { - $${currentConfig}.output.$${1}.$${2} = $${3} - $${currentConfig}.output.$${1}._KEYS_ *= $${2} - export($${currentConfig}.output.$${1}.$${2}) - export($${currentConfig}.output.$${1}._KEYS_) -} - -defineTest(qtConfOutput_define) { - output = publicHeader - define = $$eval($${1}.name) - value = $$qtConfEvaluate($$eval($${1}.value)) - isEmpty(define): \ - error("Output type 'define' used in feature '$$eval($${1}.feature)' without a 'name' entry.") - - negative = $$eval($${1}.negative) - isEmpty(negative): negative = false - equals(2, $$negative): return() - - qtConfOutputSetDefine($$output, $$define, $$value) -} - -defineTest(qtConfOutput_feature) { - name = "$$eval($${1}.name)" - isEmpty(name): \ - name = $$eval($${1}.feature) - - $${2} { - isEmpty($${currentConfig}.module): \ - qtConfOutputVar(append, "publicPro", "QT_CONFIG", $$name) - else: \ - qtConfExtendVar("publicPro", "QT.$${currentModule}.QT_CONFIG", $$name) - } else { - f = $$upper($$replace(name, -, _)) - qtConfOutputSetDefine("publicHeader", "QT_NO_$$f") - } -} - -defineTest(qtConfSetModuleName) { - currentModule = $$eval($${currentConfig}.module) - isEmpty(currentModule): \ - currentModule = global - export(currentModule) -} - -defineTest(qtConfSetupModuleOutputs) { - qtConfOutputVar(assign, "publicPro", "QT.$${currentModule}.enabled_features", ) - qtConfOutputVar(assign, "publicPro", "QT.$${currentModule}.disabled_features", ) - qtConfOutputVar(assign, "privatePro", "QT.$${currentModule}_private.enabled_features", ) - qtConfOutputVar(assign, "privatePro", "QT.$${currentModule}_private.disabled_features", ) - !isEmpty($${currentConfig}.module) { - qtConfOutputVar(assign, "publicPro", "QT.$${currentModule}.QT_CONFIG", ) - qtConfOutputVar(assign, "publicPro", "QT.$${currentModule}.exports", ) - qtConfOutputVar(assign, "privatePro", "QT.$${currentModule}_private.libraries", ) - } -} - -defineTest(qtConfOutput_publicFeature) { - name = "$$eval($${1}.name)" - isEmpty(name): \ - name = $$eval($${1}.feature) - feature = $$replace(name, [-+.], _) - - $${2} { - qtConfExtendVar("publicPro", "QT.$${currentModule}.enabled_features", $$name) - QT.$${currentModule}.enabled_features += $$name - export(QT.$${currentModule}.enabled_features) - qtConfOutputSetDefine("publicHeader", "QT_FEATURE_$$feature", 1) - } else { - qtConfExtendVar("publicPro", "QT.$${currentModule}.disabled_features", $$name) - QT.$${currentModule}.disabled_features += $$name - export(QT.$${currentModule}.disabled_features) - qtConfOutputSetDefine("publicHeader", "QT_FEATURE_$$feature", -1) - } -} - -defineTest(qtConfOutput_privateFeature) { - name = "$$eval($${1}.name)" - isEmpty(name): \ - name = $$eval($${1}.feature) - feature = $$replace(name, [-+.], _) - - $${2} { - qtConfExtendVar("privatePro", "QT.$${currentModule}_private.enabled_features", $$name) - QT.$${currentModule}_private.enabled_features += $$name - export(QT.$${currentModule}_private.enabled_features) - qtConfOutputSetDefine("privateHeader", "QT_FEATURE_$$feature", 1) - } else { - qtConfExtendVar("privatePro", "QT.$${currentModule}_private.disabled_features", $$name) - QT.$${currentModule}_private.disabled_features += $$name - export(QT.$${currentModule}_private.disabled_features) - qtConfOutputSetDefine("privateHeader", "QT_FEATURE_$$feature", -1) - } -} - -defineTest(qtConfProcessOneOutput) { - feature = $${1} - fpfx = $${currentConfig}.features.$${feature} - opfx = $${fpfx}.output.$${2} - - call = $$eval($${opfx}.type) - isEmpty(call) { - # output is just a string, not an object - call = $$eval($$opfx) - } - !defined("qtConfOutput_$$call", test): \ - error("Undefined type '$$call' in output '$$2' of feature '$$feature'.") - - !$$qtConfEvaluate($$eval($${opfx}.condition)): \ - return() - - $${opfx}.feature = $$feature - qtConfOutput_$${call}($$opfx, $$eval($${fpfx}.available)) -} - -defineTest(qtConfProcessOutput) { - !contains($${currentConfig}._KEYS_, "features"): \ - return() - - basedir = $$shadowed($$eval($${currentConfig}.dir)) - module = $$eval($${currentConfig}.module) - - # write it to the output files - !defined($${currentConfig}.files._KEYS_, var) { - # set defaults that should work for most Qt modules - isEmpty(module): \ - error("Neither module nor files section specified in configuration file.") - - $${currentConfig}.files._KEYS_ = publicPro privatePro publicHeader privateHeader - $${currentConfig}.files.publicPro = qt$${module}-config.pri - $${currentConfig}.files.privatePro = qt$${module}-config.pri # sic! - $${currentConfig}.files.publicHeader = qt$${module}-config.h - $${currentConfig}.files.privateHeader = qt$${module}-config_p.h - } - - for (type, $${currentConfig}.files._KEYS_) { - contains(type, ".*Pro") { - for (k, $${currentConfig}.output.$${type}.assign._KEYS_): \ - $${currentConfig}.output.$$type += "$$k = $$eval($${currentConfig}.output.$${type}.assign.$$k)" - for (k, $${currentConfig}.output.$${type}.remove._KEYS_): \ - $${currentConfig}.output.$$type += "$$k -= $$eval($${currentConfig}.output.$${type}.remove.$$k)" - for (k, $${currentConfig}.output.$${type}.append._KEYS_): \ - $${currentConfig}.output.$$type += "$$k += $$eval($${currentConfig}.output.$${type}.append.$$k)" - } else: contains(type, ".*Header") { - for (define, $${currentConfig}.output.$${type}._KEYS_) { - value = $$eval($${currentConfig}.output.$${type}.$${define}) - $${currentConfig}.output.$$type += "$${LITERAL_HASH}define $$define $$value" - } - } - - content = $$eval($${currentConfig}.output.$${type}) - - !isEmpty(module): \ - call = qtConfOutputPostProcess_$${module}_$${type} - else: \ - call = qtConfOutputPostProcess_$${type} - defined($$call, replace): \ - eval(content = \$\$"$$call"(\$\$content)) - - file = $$eval($${currentConfig}.files.$${type}) - fileCont.$$file += $$content - fileCont._KEYS_ *= $$file - } - - for (file, fileCont._KEYS_): \ - write_file($$basedir/$$file, fileCont.$$file)|error() -} - -# -# tie it all together -# - -!isEmpty(_QMAKE_SUPER_CACHE_):!equals(OUT_PWD, $$dirname(_QMAKE_SUPER_CACHE_)) { - # sub-repo within a top-level build; no need to configure anything. - !isEmpty(QMAKE_EXTRA_ARGS) { - # sub-projects don't get the extra args passed down automatically, - # so we can use their presence to detect misguided attempts to - # configure the repositories separately. - # caveat: a plain qmake call is indistinguishable from a recursion - # (by design), so we cannot detect this case. - error("You cannot configure $$TARGET separately within a top-level build.") - } - return() -} - -config.$${TARGET}.dir = $$_PRO_FILE_PWD_ -cfgs = $$TARGET -!isEmpty(_QMAKE_SUPER_CACHE_) { - for (s, SUBDIRS) { - config.$${s}.dir = $$_PRO_FILE_PWD_/$${s} - cfgs += $$s - } -} -configsToProcess = -for (c, cfgs) { - s = $$eval(config.$${c}.dir) - exists($$s/configure.json): \ - configsToProcess += $$c -} -isEmpty(configsToProcess) { - !isEmpty(QMAKE_EXTRA_ARGS): \ - error("This module does not accept configure command line arguments.") - return() -} - -load(configure_base) - -QMAKE_POST_CONFIGURE = -config.builtins.dir = $$PWD/data -configsToProcess = builtins $$configsToProcess -allConfigs = -for(ever) { - isEmpty(configsToProcess): \ - break() - - thisConfig = $$take_first(configsToProcess) - currentConfig = config.$$thisConfig - thisDir = $$eval($${currentConfig}.dir) - jsonFile = $$thisDir/configure.json - priFile = $$thisDir/configure.pri - - # load configuration data - configure_data = $$cat($$jsonFile, blob) - !parseJson(configure_data, $$currentConfig): \ - error("Invalid or non-existent file $${jsonFile}.") - exists($$priFile): \ - !include($$priFile): error() - - # only configs which contain more than just subconfigs are saved for later. - $${currentConfig}._KEYS_ -= subconfigs - !isEmpty($${currentConfig}._KEYS_) { - allConfigs += $$currentConfig - contains($${currentConfig}._KEYS_, libraries) { - qtConfSetupLibraries() - # this ensures that references in QMAKE_LIBRARY_DEPS are unique. - qtConfSetModuleName() - ex = $$eval(config.modules.$${currentModule}) - !isEmpty(ex): \ - error("Module $$currentModule is claimed by both $$currentConfig and $${ex}.") - config.modules.$${currentModule} = $$currentConfig - } - } - - # prepend all subconfigs to files to keep a depth first search order - subconfigs = - for(n, $${currentConfig}.subconfigs._KEYS_) { - subconfig = $$eval($${currentConfig}.subconfigs.$${n}) - name = $${thisConfig}_$$basename(subconfig) - ex = $$eval(config.$${name}.dir) - !isEmpty(ex): \ - error("Basename clash between $$thisDir/$$subconfig and $${ex}.") - config.$${name}.dir = $$thisDir/$$subconfig - subconfigs += $$name - } - configsToProcess = $$subconfigs $$configsToProcess -} -# 'builtins' is used for command line parsing and test type dependency -# injection, but its features must not be processed regularly. -allModuleConfigs = $$member(allConfigs, 1, -1) - -QMAKE_SAVED_ARGS = $$QMAKE_EXTRA_ARGS -QMAKE_REDO_CONFIG = false -qtConfParseCommandLine() -qtConfCheckErrors() - -!isEmpty(config.input.list-features) { - all_ft = - for (currentConfig, allModuleConfigs) { - for (k, $${currentConfig}.features._KEYS_) { - pp = $$eval($${currentConfig}.features.$${k}.purpose) - !isEmpty(pp) { - pfx = $$eval($${currentConfig}.features.$${k}.section) - !isEmpty(pfx): pfx = "$$pfx: " - all_ft += $$qtConfPadCols($$k, ".......................", \ - $$pfx$$section(pp, $$escape_expand(\\n), 0, 0)) - } - } - } - all_ft = $$sorted(all_ft) - logn() - for (ft, all_ft): \ - logn($$ft) - error() -} - -!isEmpty(config.input.list-libraries) { - logn() - for (currentConfig, allModuleConfigs) { - !isEmpty($${currentConfig}.exports._KEYS_) { - !isEmpty($${currentConfig}.module): \ - logn($$eval($${currentConfig}.module):) - else: \ - logn($$section(currentConfig, ., -1):) - all_xp = - for (xport, $${currentConfig}.exports._KEYS_) { - libs = $$eval($${currentConfig}.exports.$$xport) - isEqual($${currentConfig}.libraries.$$first(libs).export, "") { # not isEmpty()! - !isEmpty(config.input.verbose): \ - all_xp += "$$xport!" - } else { - out = "$$xport" - !isEmpty(config.input.verbose):!isEqual(xport, $$libs): \ - out += "($$libs)" - all_xp += "$$out" - } - } - all_xp = $$sorted(all_xp) - all_xp ~= s,^([^!]*)!$,(\\1),g - for (xp, all_xp): \ - logn(" $$xp") - } - } - error() -} - -QMAKE_CONFIG_VERBOSE = $$eval(config.input.verbose) -isEmpty(QMAKE_CONFIG_VERBOSE): \ - QMAKE_CONFIG_VERBOSE = false -QMAKE_CONFIG_LOG = $$OUT_PWD/config.log -write_file($$QMAKE_CONFIG_LOG, "") -qtLog("Command line: $$qtSystemQuote($$QMAKE_SAVED_ARGS)") -$$QMAKE_REDO_CONFIG: \ - qtLog("config.opt: $$qtSystemQuote($$QMAKE_EXTRA_REDO_ARGS)") - -for (currentConfig, allModuleConfigs) { - qtConfSetModuleName() - qtConfSetupModuleOutputs() - # do early checks, mainly to validate the command line - qtConfProcessEarlyChecks() -} -qtConfCheckErrors() - -QMAKE_CONFIG_CACHE = $$OUT_PWD/config.cache -QMAKE_CONFIG_CACHE_USE = $$eval(config.input.cache_use) -cache_recheck = $$eval(config.input.cache_recheck) -equals(cache_recheck, yes) { - QMAKE_CONFIG_CACHE_USE = positive - cache_recheck = -} -isEmpty(QMAKE_CONFIG_CACHE_USE): \ - QMAKE_CONFIG_CACHE_USE = all -!equals(QMAKE_CONFIG_CACHE_USE, none) { - include($$QMAKE_CONFIG_CACHE, , true) - # this crudely determines when to discard the cache. this also catches the case - # of no cache being there in the first place. - !equals(cache.platform, $$[QMAKE_SPEC])|!equals(cache.xplatform, $$[QMAKE_XSPEC]) { - QMAKE_CONFIG_CACHE_USE = none - } else: !isEmpty(cache_recheck) { - for (cr, $$list($$split(cache_recheck, ","))) { - !isEmpty(cache.$${cr}._KEYS_) { - cache.$${cr}._KEYS_ = - } else { - qtConfAddWarning("Attempting to discard non-cached result '$$cr'.") - } - } - } -} -equals(QMAKE_CONFIG_CACHE_USE, none) { - cont = \ - "cache.platform = $$[QMAKE_SPEC]" \ - "cache.xplatform = $$[QMAKE_XSPEC]" - write_file($$QMAKE_CONFIG_CACHE, cont) -} - -CONFIG += qt_conf_tests_allowed -logn() -logn("Running configuration tests...") - -for (currentConfig, allModuleConfigs) { - tdir = $$eval($${currentConfig}.testDir) - isEmpty(tdir): tdir = config.tests - QMAKE_CONFIG_TESTS_DIR = $$absolute_path($$tdir, $$eval($${currentConfig}.dir)) - - qtConfSetModuleName() - - qtConfSetupTestTypeDeps() - - # correctly setup dependencies - QMAKE_CONFIG_DEPS = global global_private - QMAKE_LIBRARY_DEPS = $$eval(config.modules.global) - !isEmpty($${currentConfig}.module) { - for (d, $${currentConfig}.depends._KEYS_) { - dep = $$replace($${currentConfig}.depends.$$d, -private$, _private) - gdep = $$replace(dep, _private$, ) - dep *= $$gdep - QMAKE_CONFIG_DEPS += $$dep - !isEqual(gdep, $$dep): \ # libraries are in the private module. - QMAKE_LIBRARY_DEPS += $$eval(config.modules.$$gdep) - } - } - - qtConfCheckModuleCondition() - - qtConfHaveModule($$currentModule) { - # process all features - qtConfProcessFeatures() - } else { - qtConfOutputVar(assign, "privatePro", "QT.$${currentModule}.skip", "true") - } - - # generate files and reports - qtConfProcessOutput() - qtConfHaveModule($$currentModule) { - qtConfCreateReport() - qtConfCreateSummary() - } else { - QT_CONFIGURE_SKIPPED_MODULES += " $$currentModule" - } -} - -!isEmpty(QT_CONFIGURE_SKIPPED_MODULES): \ - qtConfAddNote("The following modules are not being compiled in this configuration:" $$QT_CONFIGURE_SKIPPED_MODULES) - -logn("Done running configuration tests.") -logn() - -!$$QMAKE_REDO_CONFIG { - write_file($$OUT_PWD/config.opt, QMAKE_SAVED_ARGS)|error() -} - -# these come from the pri files loaded above. -for (p, QMAKE_POST_CONFIGURE): \ - eval($$p) - -logn("Configure summary:") -logn() -qtConfPrintReport() - -load(qt_prefix_build_check) - -# final notes for the user -logn() -logn("Qt is now configured for building. Just run '$$QMAKE_MAKE_NAME'.") -pfx = $$[QT_INSTALL_PREFIX] -qtIsPrefixBuild($$pfx) { - logn("Once everything is built, you must run '$$QMAKE_MAKE_NAME install'.") - logn("Qt will be installed into '$$system_path($$pfx)'.") -} else { - logn("Once everything is built, Qt is installed.") - logn("You should NOT run '$$QMAKE_MAKE_NAME install'.") - logn("Note that this build cannot be deployed to other machines or devices.") -} -logn() -logn("Prior to reconfiguration, make sure you remove any leftovers from") -logn("the previous build.") -logn() diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf deleted file mode 100644 index 095bf15dac..0000000000 --- a/mkspecs/features/qt_docs.prf +++ /dev/null @@ -1,126 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -!exists($$QMAKE_DOCS): error("Cannot find documentation specification file $$QMAKE_DOCS") - -qtver.name = QT_VERSION -qtver.value = $$VERSION -isEmpty(qtver.value): qtver.value = $$MODULE_VERSION -isEmpty(qtver.value): error("No version for documentation specified.") -qtmver.name = QT_VER -qtmver.value = $$replace(qtver.value, ^(\\d+\\.\\d+).*$, \\1) -qtvertag.name = QT_VERSION_TAG -qtvertag.value = $$replace(qtver.value, \\.,) -qtdocs.name = QT_INSTALL_DOCS -qtdocs.value = $$[QT_INSTALL_DOCS/src] -builddir.name = BUILDDIR -builddir.value = $$OUT_PWD -QT_TOOL_ENV = qtver qtmver qtvertag qtdocs builddir -qtPrepareTool(QDOC, qdoc) -QT_TOOL_ENV = - -# On Windows, put the includes into a .inc file which QDoc will read, if the project -# has too many includes. We do this to overcome a command-line limit on Windows. -WIN_INCLUDETEMP= -INCLUDE_PATHS=$$INCPATH -win32:count(INCLUDE_PATHS, 30, >) { - WIN_INCLUDETEMP = $$OUT_PWD/qdocincludepaths.inc - WIN_INCLUDETEMP_CONTENT = - for (inc, INCLUDE_PATHS): \ - WIN_INCLUDETEMP_CONTENT += -I$$inc - write_file($$absolute_path($$WIN_INCLUDETEMP, $$OUT_PWD), WIN_INCLUDETEMP_CONTENT)|error() -} - -isEmpty(WIN_INCLUDETEMP) { - QDOC_INCLUDE_PATHS=$(INCPATH) -} else { - QDOC_INCLUDE_PATHS=@$$shell_quote($$WIN_INCLUDETEMP) -} - -macos: QDOC_INCLUDE_PATHS += $$join(QMAKE_DEFAULT_INCDIRS," -I","-I") - -!build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator) - -qtPrepareTool(QTATTRIBUTIONSSCANNER, qtattributionsscanner) - -# qtPrepareTool() must be called outside a build pass, as it protects -# against concurrent wrapper creation by omitting it during build passes. -# However, creating the actual targets is reserved to the build passes. -debug_and_release:!build_pass: return() - -load(qt_build_paths) -QMAKE_DOCS_BASE_OUTDIR = $$MODULE_BASE_OUTDIR/doc - -QMAKE_DOCS_TARGET = $$replace(QMAKE_DOCS, ^(.*/)?(.*)\\.qdocconf$, \\2) -isEmpty(QMAKE_DOCS_TARGETDIR): QMAKE_DOCS_TARGETDIR = $$QMAKE_DOCS_TARGET -QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR - -QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) -!build_online_docs: \ - QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) -PREP_DOC_INDEXES = -DOC_INDEXES = -!isEmpty(QTREPOS) { - prepare_docs { - # This is not for linking, but for providing type information. - mps = - deps = $$replace(QT, -private$, ) - deps = $$resolve_depends(deps, "QT.") - for (d, deps): \ - mps += $$dirname(QT.$${d}.libs) - mps = $$unique(mps) - for (mp, mps): \ - PREP_DOC_INDEXES += -indexdir $$shell_quote($$mp/doc) - } - for(qrep, QTREPOS): \ - DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) -} else { - prepare_docs: \ - PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) - DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -} - -qtattributionsscanner.target = qtattributionsscanner -qtattributionsscanner.commands = $$QTATTRIBUTIONSSCANNER $$shell_quote($$MODULE_BASE_INDIR) \ - --filter "QDocModule=$$QMAKE_DOCS_TARGET" -o $$shell_quote($$OUT_PWD/codeattributions.qdoc) -qtattributionsscanner.CONFIG += phony -QMAKE_EXTRA_TARGETS += qtattributionsscanner - -doc_command = $$QDOC $$QMAKE_DOCS -prepare_docs { - prepare_docs.commands += $$doc_command -prepare $$PREP_DOC_INDEXES -no-link-errors $$QDOC_INCLUDE_PATHS - generate_docs.commands += $$doc_command -generate $$DOC_INDEXES $$QDOC_INCLUDE_PATHS - prepare_docs.depends += qtattributionsscanner -} else { - html_docs.commands += $$doc_command $$DOC_INDEXES $(QDOC_INCLUDE_PATHS) - html_docs.depends += qtattributionsscanner -} - -!build_online_docs { - qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) - - inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR - inst_html_docs.path = $$[QT_INSTALL_DOCS] - inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build - INSTALLS += inst_html_docs - - inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch - inst_qch_docs.path = $$[QT_INSTALL_DOCS] - inst_qch_docs.CONFIG += no_check_exist no_default_install no_build - INSTALLS += inst_qch_docs - - install_html_docs.depends = install_inst_html_docs - uninstall_html_docs.depends = uninstall_inst_html_docs - install_qch_docs.depends = install_inst_qch_docs - uninstall_qch_docs.depends = uninstall_inst_qch_docs - install_docs.depends = install_html_docs install_qch_docs - uninstall_docs.depends = uninstall_html_docs uninstall_qch_docs -} diff --git a/mkspecs/features/qt_docs_targets.prf b/mkspecs/features/qt_docs_targets.prf deleted file mode 100644 index 9e96432462..0000000000 --- a/mkspecs/features/qt_docs_targets.prf +++ /dev/null @@ -1,45 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -DOC_TARGETS = \ - install_html_docs uninstall_html_docs \ - install_qch_docs uninstall_qch_docs \ - install_docs uninstall_docs \ - qch_docs - -prepare_docs { - DOC_TARGETS += prepare_docs generate_docs - html_docs.commands = $(MAKE) -f $(MAKEFILE) prepare_docs && $(MAKE) -f $(MAKEFILE) generate_docs - QMAKE_EXTRA_TARGETS += html_docs -} else { - DOC_TARGETS += html_docs -} - -docs.commands = $(MAKE) -f $(MAKEFILE) html_docs && $(MAKE) -f $(MAKEFILE) qch_docs -QMAKE_EXTRA_TARGETS += docs - -contains(TEMPLATE, subdirs) { - for(inst, DOC_TARGETS): \ - prepareRecursiveTarget($$inst) -} else { - !isEmpty(BUILDS):!build_pass { - sub = $$first(BUILDS) - for(inst, DOC_TARGETS) { - $${inst}.CONFIG = recursive - $${inst}.recurse = $$sub - } - } - # Apps and libs request docs creation by setting QMAKE_DOCS. - # This is a backwards compat hack - technically, the modules which need it - # are supposed to load(qt_docs) themselves. - !isEmpty(QMAKE_DOCS): load(qt_docs) -} -QMAKE_EXTRA_TARGETS += $$DOC_TARGETS diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf deleted file mode 100644 index 15b373ba40..0000000000 --- a/mkspecs/features/qt_example_installs.prf +++ /dev/null @@ -1,149 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -defineTest(addInstallFiles) { - for(sf, 2) { - sf = $$relative_path($$sf, $$_PRO_FILE_PWD_) - contains(sf, \\..*) { - check_examples: message("Notice: $$_PRO_FILE_ refers to $$sf") - } else { - sfp = $$replace(sf, /.*, ) - !equals(sfp, $$sf): \ - $$1 *= $$sfp - else: \ - $$1 += $$sf - } - } - export($$1) -} - -moduleRoot = $$dirname(_QMAKE_CONF_) -probase = $$relative_path($$_PRO_FILE_PWD_, $$moduleRoot/examples) -isEmpty(probase)|contains(probase, ^\\..*): \ - return() - -isEmpty(_QMAKE_CACHE_) { - moduleRootRelativeToBuildDir = $$relative_path($$moduleRoot, $$OUT_PWD) - # Check if OUT_PWD is inside module root - equals(moduleRootRelativeToBuildDir, .)|contains(moduleRootRelativeToBuildDir, \(\.\./\)+\(\.\.\)?): \ - error("You cannot build examples inside the Qt source tree, except as part of a proper Qt build.") -} - -contains(TEMPLATE, "vc.*"): \ - return() - -contains(TEMPLATE, .*app): \ - qtSetQmlPath() - -for(ex, EXAMPLE_FILES): \ - sourcefiles += $$files($$absolute_path($$ex, $$_PRO_FILE_PWD_)) -for(res, RESOURCES) { - !contains(res, .*\\.qrc): \ - next() - rfile = $$absolute_path($$res, $$_PRO_FILE_PWD_) - rpath = $$dirname(rfile) - rcont = $$cat($$rfile, lines) - for (rline, rcont) { - resrc = $$replace(rline, ^[ \\t]*<file[^>]*>([^<]+)</file>[ \\t]*$, \\1) - !equals(resrc, $$rline): \ - sourcefiles += $$absolute_path($$resrc, $$rpath) - } -} -for(res, RC_FILE) { - rfile = $$absolute_path($$res, $$_PRO_FILE_PWD_) - rpath = $$dirname(rfile) - rcont = $$cat($$rfile, lines) - for (rline, rcont) { - resrc = $$replace(rline, "^\\d+\\s+ICON\\s+[^\"]*\"([^\"]+)\"\$", \\1) - !equals(resrc, $$rline): \ - sourcefiles += $$absolute_path($$resrc, $$rpath) - } -} -sourcefiles += \ - $$ANDROID_PACKAGE_SOURCE_DIR \ - $$QMAKE_INFO_PLIST \ - $$DISTFILES -extras = \ - $$_PRO_FILE_PWD_/README \ - $$_PRO_FILE_PWD_/README.TXT \ - $$_PRO_FILE_PWD_/qmldir \ - $$files($$_PRO_FILE_PWD_/*.pri) \ - $$replace(_PRO_FILE_, \\.pro$, .qmlproject) \ - $$replace(_PRO_FILE_, \\.pro$, .json) \ - $$replace(_PRO_FILE_, \\.pro$, .inf) -for(extra, extras): \ - exists($$extra): \ - sourcefiles += $$extra - -# Just for Qt Creator -OTHER_FILES += $$sourcefiles - -sourcefiles += \ - $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ - $$DBUS_ADAPTORS $$DBUS_INTERFACES -addInstallFiles(sources.files, $$sourcefiles) -sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase -INSTALLS += sources - -check_examples { - srcfiles = $$sources.files - for(inst, INSTALLS): \ - !equals(inst, target):!contains($${inst}.CONFIG, no_check_exist): \ - for(file, $${inst}.files): \ - instfiles += $$files($$absolute_path($$file, $$_PRO_FILE_PWD_)) - addInstallFiles(srcfiles, $$instfiles) - - thefiles = $$files($$_PRO_FILE_PWD_/*) - for(i, thefiles): \ - allfiles += $$relative_path($$i, $$_PRO_FILE_PWD_) - for(i, srcfiles): \ - allfiles -= $$relative_path($$i, $$_PRO_FILE_PWD_) - for(i, SUBDIRS) { - sd = $$eval($${i}.file) - !isEmpty(sd) { - sd ~= s,/.*,, - } else { - sd = $$eval($${i}.subdir) - isEmpty(sd): sd = $$i - } - allfiles -= $$sd - } - allfiles -= doc - !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") -} - -equals(TEMPLATE, app)|equals(TEMPLATE, lib) { - !contains(INSTALLS, target) { - !install_ok: \ - error("$$_PRO_FILE_ is lacking an install target.") - else: check_examples: \ - warning("$$_PRO_FILE_ is lacking an install target.") - } else: !equals(target.path, $$sources.path) { - !install_ok: \ - error("$$_PRO_FILE_ installs target to unexpected location.") - else: check_examples: \ - warning("$$_PRO_FILE_ installs target to unexpected location.") - } -} - -!equals(TEMPLATE, subdirs):!compile_examples { - TEMPLATE = aux - CONFIG -= have_target qt staticlib dll - SOURCES = - OBJECTIVE_SOURCES = - INSTALLS -= target - QMAKE_SUBSTITUTES = - QMAKE_EXTRA_COMPILERS = - COPIES = -} else { - CONFIG += relative_qt_rpath # Examples built as part of Qt should be relocatable -} diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 7777e615bd..f1371c8cc6 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -1,9 +1,13 @@ defineReplace(qtPlatformTargetSuffix) { + config_variable = $$1 + isEmpty(config_variable): \ + config_variable = CONFIG + suffix = android: return($${suffix}_$${QT_ARCH}) win32 { - CONFIG(debug, debug|release) { + contains($$config_variable, debug, debug|release) { mingw { qtConfig(debug_and_release):build_pass: \ return($${suffix}d) @@ -14,7 +18,7 @@ defineReplace(qtPlatformTargetSuffix) { } } darwin { - CONFIG(debug, debug|release) { + contains($$config_variable, debug, debug|release) { !debug_and_release|build_pass: \ return($${suffix}_debug) } @@ -83,11 +87,19 @@ defineTest(qtHaveModule) { return(false) } -# variable, default, [suffix for variable for system() use], [prepare primary variable for system() use] +# Arguments: +# variable, default, [suffix for variable for system() use], +# [prepare primary variable for system() use], +# [installation location; default: $$[QT_HOST_BINS]] defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { - cmd = $$[QT_HOST_BINS]/$$2 + isEmpty(5) { + instloc = $$[QT_HOST_BINS] + } else { + instloc = $$5 + } + cmd = $$instloc/$$2 exists($${cmd}.pl) { $${1}_EXE = $${cmd}.pl cmd = perl -w $$system_path($${cmd}.pl) @@ -123,6 +135,15 @@ defineTest(qtPrepareTool) { } } +# Prepare a tool that's not supposed to be called manually by users but by the build system. +# +# Forwards its arguments to qtPrepareTool but defaults the installation location to +# $$[QT_HOST_LIBEXECS] +defineTest(qtPrepareLibExecTool) { + isEmpty(instloc): instloc = "$$[QT_HOST_LIBEXECS]" + qtPrepareTool($$1, $$2, $$3, $$4, $$instloc) +} + # target variable, list of env var names, [non-empty: prepare for system(), not make] defineTest(qtAddToolEnv) { isEmpty(3): \ diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf deleted file mode 100644 index bc20251bd9..0000000000 --- a/mkspecs/features/qt_helper_lib.prf +++ /dev/null @@ -1,92 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -load(qt_build_paths) - -TEMPLATE = lib -CONFIG -= qt -QT = # In case qt is re-added. - -INCLUDEPATH += $$MODULE_INCLUDEPATH -DEFINES += $$MODULE_DEFINES - -CONFIG -= warning_clean # Don't presume 3rd party code to be clean -load(qt_common) - -qtConfig(debug_and_release): CONFIG += debug_and_release -qtConfig(build_all): CONFIG += build_all - -DESTDIR = $$MODULE_BASE_OUTDIR/lib -DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin - -THE_TARGET = $$qt5LibraryTarget($$TARGET) - -MODULE = $$replace(TARGET, ^qt, ) -MODULE ~= s,-,_, -MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_ext_$${MODULE}.pri -ucmodule = $$upper($$MODULE) -win32|CONFIG(static, static|shared) { - prefix = $$QMAKE_PREFIX_STATICLIB - suffix = $$QMAKE_EXTENSION_STATICLIB -} else { - prefix = $$QMAKE_PREFIX_SHLIB - suffix = $$QMAKE_EXTENSION_SHLIB -} - -!build_pass { - CC_USES = - LD_USES = - for (use, QMAKE_USE) { - use = $$split(use, /) - name = $$take_first(use) - nu = $$upper($$replace(name, -, _)) - !contains(use, linkonly): CC_USES += $$nu - !contains(use, nolink): LD_USES += $$nu - } - CC_USES = $$unique(CC_USES) - LD_USES = $$unique(LD_USES) - MODULE_PRI_CONT = \ - "QMAKE_DEPENDS_$${ucmodule}_CC =$$join(CC_USES, " ", " ")" \ - "QMAKE_DEPENDS_$${ucmodule}_LD =$$join(LD_USES, " ", " ")" \ - "QMAKE_INCDIR_$${ucmodule} = $$val_escape(MODULE_INCLUDEPATH)" \ - "QMAKE_DEFINES_$${ucmodule} = $$val_escape(MODULE_DEFINES)" - !single_android_abi:android { - MODULE_PRI_CONT += "QMAKE_LIBS_$${ucmodule} =" - } else: if(msvc|qtConfig(debug_and_release)): { - win32: \ - MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}d.$$suffix - else: darwin: \ - MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}_debug.$$suffix - else: \ - error("'$$QMAKE_PLATFORM' does not do debug_and_release.") - MODULE_RELEASE_LIBS = $$DESTDIR/$$prefix$${TARGET}.$$suffix - MODULE_PRI_CONT += \ - "QMAKE_LIBS_$${ucmodule} =" \ # Needed for the module to be recognized. - "QMAKE_LIBS_$${ucmodule}_DEBUG = $$val_escape(MODULE_DEBUG_LIBS)" \ - "QMAKE_LIBS_$${ucmodule}_RELEASE = $$val_escape(MODULE_RELEASE_LIBS)" - } else { - MODULE_LIBS = $$DESTDIR/$$prefix$${THE_TARGET}.$$suffix - MODULE_PRI_CONT += \ - "QMAKE_LIBS_$${ucmodule} = $$val_escape(MODULE_LIBS)" - } - write_file($$MODULE_PRI, MODULE_PRI_CONT)|error() -} else: android { - ABI_TARGET = $$qt5LibraryTarget($$TARGET) - ABI_MODULE_LIBS = $$DESTDIR/$$prefix$${ABI_TARGET}.$$suffix - MODULE_PRI_CONT = "QMAKE_LIBS_$${ucmodule}_$${QT_ARCH} = $$val_escape(ABI_MODULE_LIBS)" - write_file($$MODULE_PRI, MODULE_PRI_CONT, append)|error() -} - -TARGET = $$THE_TARGET - -# In static builds of Qt, convenience libraries must be installed, -# as in this case they are not linked to the final library/plugin. -installed|if(!not_installed:qtConfig(static)): load(qt_installs) diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf deleted file mode 100644 index 1ebca17366..0000000000 --- a/mkspecs/features/qt_installs.prf +++ /dev/null @@ -1,64 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -#library -!qt_no_install_library { - win32 { - host_build: \ - dlltarget.path = $$[QT_HOST_BINS] - else: \ - dlltarget.path = $$[QT_INSTALL_BINS] - INSTALLS += dlltarget - } - host_build: \ - target.path = $$[QT_HOST_LIBS] - else: \ - target.path = $$[QT_INSTALL_LIBS] - !static: target.CONFIG = no_dll - INSTALLS += target -} - -#headers -qt_install_headers { - gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES - gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME - INSTALLS += gen_headers - - targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES - targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME - INSTALLS += targ_headers - - private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES - private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private - generated_privates: \ - private_headers.CONFIG += no_check_exist - INSTALLS += private_headers - - qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES - qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa - INSTALLS += qpa_headers -} - -#module -qt_install_module { - !isEmpty(MODULE_PRI) { - pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules - pritarget.files = $$MODULE_PRI - INSTALLS += pritarget - } else: isEmpty(MODULE_PRIVATE_PRI) { - warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") - } - !isEmpty(MODULE_PRIVATE_PRI) { - privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules - privpritarget.files = $$MODULE_PRIVATE_PRI - INSTALLS += privpritarget - } -} diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf deleted file mode 100644 index 828a9621b9..0000000000 --- a/mkspecs/features/qt_module.prf +++ /dev/null @@ -1,341 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) -isEmpty(VERSION): VERSION = $$MODULE_VERSION -isEmpty(VERSION): error("Module does not define version.") - -isEmpty(MODULE_CFG_FILE): MODULE_CFG_FILE = qt$${MODULE}-config -exists($$OUT_PWD/$${MODULE_CFG_FILE}.pri) { - include($$OUT_PWD/$${MODULE_CFG_FILE}.pri) - CONFIG += generated_privates -} - -skip = $$eval(QT.$${MODULE}.skip) -isEmpty(skip): skip = false -requires(!$$skip) - -# Compile as shared/DLL or static according to the option given to configure -# unless overridden. Host builds are always static -host_build|staticlib: CONFIG += static - -host_build { - QT -= gui # no host module will ever use gui - force_bootstrap { - !build_pass:qtConfig(release_tools): CONFIG += release - contains(QT, core(-private)?|xml) { - QT -= core core-private xml - QT += bootstrap-private - } - } else { - !build_pass:qtConfig(debug_and_release): CONFIG += release - } -} - -qtConfig(framework) { - minimal_syncqt: \ - CONFIG += module_frameworks - else: CONFIG(shared, static|shared): \ - CONFIG += module_frameworks lib_bundle -} - -CONFIG += relative_qt_rpath # Qt libraries should be relocatable - -# Qt libraries should only use Application Extension safe APIs -darwin:!no_app_extension_api_only: CONFIG += app_extension_api_only - -ucmodule = $$upper($$MODULE) - -isEmpty(MODULE_INCNAME): MODULE_INCNAME = $$TARGET - -internal_module: \ - MODULE_DEPENDS = $$replace(QT, -private$, _private) -else: \ - MODULE_DEPENDS = $$replace(QT, -private$, ) -MODULE_DEPENDS = $$unique(MODULE_DEPENDS) -contains(MODULE_DEPENDS, $$MODULE): \ - error("$$TARGET depends on itself.") - -contains(TARGET, QtAddOn.*): \ - MODULE_DEFINE = QT_ADDON_$${ucmodule}_LIB -else: \ - MODULE_DEFINE = QT_$${ucmodule}_LIB -MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES - -# Make sure that the supporting runtime is linked into the application when -# the module is built with exceptions enabled. -integrity:CONFIG(exceptions, exceptions|exceptions_off): \ - MODULE_CONFIG += exceptions - -load(qt_build_paths) - -header_module { - TEMPLATE = aux - CONFIG += force_qt # Needed for the headers_clean tests. - !lib_bundle: \ - CONFIG += qt_no_install_library - - # Allow creation of .prl, .la and .pc files. - target.path = $$[QT_INSTALL_LIBS] - target.CONFIG += dummy_install - INSTALLS += target -} else { - TEMPLATE = lib -} -DESTDIR = $$MODULE_BASE_OUTDIR/lib -DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin - -CONFIG += target_qt - -QMAKE_DOCS_TARGETDIR = qt$${MODULE} - -load(qt_common) -!no_module_headers: load(qt_module_headers) -load(qt_module_pris) - -INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}_private.includes) - -# If Qt was configured with -debug-and-release then build the module the same way -# - unless this is a host library -!host_build:if(win32|mac):!macx-xcode { - qtConfig(debug_and_release): CONFIG += debug_and_release - qtConfig(build_all): CONFIG += build_all -} - -QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - -QT_PRIVATE += $$QT_FOR_PRIVATE -unset(QT_FOR_PRIVATE) -QMAKE_USE_PRIVATE += $$QMAKE_USE_FOR_PRIVATE -unset(QMAKE_USE_FOR_PRIVATE) - -CONFIG += create_cmake - -contains(TARGET, QtAddOn.*): \ - DEFINES += QT_BUILD_ADDON_$${ucmodule}_LIB -else: \ - DEFINES += QT_BUILD_$${ucmodule}_LIB - -# OS X and iOS frameworks -lib_bundle { - # Set the CFBundleIdentifier prefix for Qt frameworks - QMAKE_TARGET_BUNDLE_PREFIX = org.qt-project - #QMAKE_FRAMEWORK_VERSION = 4.0 - CONFIG += sliced_bundle - header_module { - CONFIG += bundle - QMAKE_BUNDLE_NAME = $$TARGET - QMAKE_BUNDLE_EXTENSION = .framework - QMAKE_INFO_PLIST = $$QMAKESPEC/Info.plist.lib - } - !build_all| \ - if(if(!debug_and_release|CONFIG(release, debug|release))) { - FRAMEWORK_HEADERS.version = Versions - FRAMEWORK_HEADERS.files = \ - $$SYNCQT.HEADER_FILES $$SYNCQT.GENERATED_HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES - FRAMEWORK_HEADERS.path = Headers - FRAMEWORK_PRIVATE_HEADERS.version = Versions - FRAMEWORK_PRIVATE_HEADERS.files = \ - $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES - FRAMEWORK_PRIVATE_HEADERS.path = Headers/$$VERSION/$$MODULE_INCNAME/private - FRAMEWORK_QPA_HEADERS.version = Versions - FRAMEWORK_QPA_HEADERS.files = $$SYNCQT.QPA_HEADER_FILES - FRAMEWORK_QPA_HEADERS.path = Headers/$$VERSION/$$MODULE_INCNAME/qpa - QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS FRAMEWORK_PRIVATE_HEADERS FRAMEWORK_QPA_HEADERS - } -} - -mac { - macx-g++ { - QMAKE_CFLAGS += -fconstant-cfstrings - QMAKE_CXXFLAGS += -fconstant-cfstrings - } - - qtConfig(rpath): \ - QMAKE_SONAME_PREFIX = @rpath - else: \ - CONFIG += absolute_library_soname -} - -DEFINES += QT_BUILDING_QT -win32 { - INCLUDEPATH += tmp - CONFIG += skip_target_version_ext - # If the code is really "unsafe" then it is unsafe on - # other platforms as well; so fixing these warnings just - # for MSVC builds, would clutter the code and wouldn't help - # in fixing issues that might exist on other platforms. - # Using the same functions across all supported platforms - # keeps the code clean and helps in writing code that is - # safe across all platforms. - DEFINES *= _CRT_SECURE_NO_WARNINGS - - DEFINES += _USE_MATH_DEFINES -} - -aix-g++* { - QMAKE_CFLAGS += -mminimal-toc - QMAKE_CXXFLAGS += -mminimal-toc -} - -sse2:!contains(QT_CPU_FEATURES.$$QT_ARCH, sse2):!host_build:!if(static:qtConfig(shared)) { - # If the compiler supports SSE2, enable it unconditionally in all of Qt shared libraries - # (and only the libraries). This is not expected to be a problem because: - # - on Windows, sharing of libraries is uncommon - # - on Mac OS X, all x86 CPUs already have SSE2 support (we won't even reach here) - # - on Linux, the dynamic loader can find the libraries on LIBDIR/sse2/ - # The last guarantee does not apply to executables and plugins, so we can't enable for them. - QT_CPU_FEATURES.$$QT_ARCH += sse sse2 - QMAKE_CFLAGS += $$QMAKE_CFLAGS_SSE2 - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2 -} - -clang { - apple_clang_ver = $${QT_APPLE_CLANG_MAJOR_VERSION}.$${QT_APPLE_CLANG_MINOR_VERSION} - reg_clang_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION} - versionAtLeast(apple_clang_ver, 5.1)|versionAtLeast(reg_clang_ver, 3.4): \ - CONFIG += compiler_supports_fpmath -} else: gcc { - CONFIG += compiler_supports_fpmath -} - -equals(QT_ARCH, i386):contains(QT_CPU_FEATURES.$$QT_ARCH, sse2):compiler_supports_fpmath { - # Turn on SSE-based floating-point math - QMAKE_CFLAGS += -mfpmath=sse - QMAKE_CXXFLAGS += -mfpmath=sse -} - -android: CONFIG += qt_android_deps no_linker_version_script - -!header_module:unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!no_linker_version_script:!static { - verscript = $${TARGET}.version - QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript - - internal_module { - verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };" - } else { - verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \ - " qt_private_api_tag*;" - - private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES - - for(header, private_api_headers): \ - verscript_content += " @FILE:$$header@" - verscript_content += "};" - - current = Qt_$$QT_MAJOR_VERSION - verscript_content += "$$current { *; };" - isEmpty(QT_NAMESPACE): tag_symbol = qt_version_tag - else: tag_symbol = qt_version_tag_$$QT_NAMESPACE - - for(i, 0..$$QT_MINOR_VERSION) { - previous = $$current - current = Qt_$${QT_MAJOR_VERSION}.$$i - equals(i, $$QT_MINOR_VERSION): verscript_content += "$$current { $$tag_symbol; } $$previous;" - else: verscript_content += "$$current {} $$previous;" - } - - # Add a post-processing step to replace the @FILE:filename@ - verscript_in = $${verscript}.in - verscriptprocess.name = linker version script ${QMAKE_FILE_BASE} - verscriptprocess.input = verscript_in - verscriptprocess.CONFIG += no_link target_predeps - verscriptprocess.depends = $$private_api_headers - verscriptprocess.output = $$verscript - verscriptprocess.commands = perl $${PWD}/data/unix/findclasslist.pl < ${QMAKE_FILE_IN} > $@ - silent:verscriptprocess.commands = @echo creating linker version script ${QMAKE_FILE_BASE} && $$verscriptprocess.commands - QMAKE_EXTRA_COMPILERS += verscriptprocess - - verscript = $$verscript_in - } - write_file($$OUT_PWD/$$verscript, verscript_content)|error() - unset(current) - unset(previous) - unset(verscript) - unset(verscript_content) -} - -#install directives -load(qt_installs) - -load(qt_targets) - -# this builds on top of qt_common -!internal_module:if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) { - CONFIG += create_pc - QMAKE_PKGCONFIG_DESTDIR = pkgconfig - host_build: \ - QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] - else: \ - QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] - lib_bundle { - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_LIBS/raw]/$${MODULE_INCNAME}.framework/Headers - QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE - } else { - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] - QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME - for(inc, MODULE_AUX_INCLUDES): \ - QMAKE_PKGCONFIG_CFLAGS += -I${includedir}/$$section(inc, /, 1, 1) - } - QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") - QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION)$$qtPlatformTargetSuffix() - for(i, MODULE_DEPENDS): \ - QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))$$qtPlatformTargetSuffix() - isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ - QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module - !isEmpty(lib_replace0.match) { - pclib_replace0.match = $$lib_replace0.match - pclib_replace0.replace = $$QMAKE_PKGCONFIG_LIBDIR/ - pclib_replace0.CONFIG = path - QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace0 - } - pclib_replace.match = $$lib_replace.match - !isEmpty(lib_replace.replace): \ - pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR - pclib_replace.CONFIG = path - QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace -} -!lib_bundle:unix { - CONFIG += create_libtool - host_build: \ - QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] - else: \ - QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" - !isEmpty(lib_replace0.match) { - ltlib_replace0.match = $$lib_replace0.match - ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ - ltlib_replace0.CONFIG = path - QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace0 - } - ltlib_replace.match = $$lib_replace.match - !isEmpty(lib_replace.replace): \ - ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR - ltlib_replace.CONFIG = path - QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace -} - -contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE -DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS -DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code -DEFINES *= QT_USE_QSTRINGBUILDER -DEFINES *= QT_DEPRECATED_WARNINGS - -win32 { - # On Windows, due to the way DLLs work, we need to export all functions, - # including the inlines - DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x040800 -} else { - # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API - DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 -} -DEFINES *= QT_DEPRECATED_WARNINGS_SINCE=0x060000 - -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX) # Do this towards the end diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf deleted file mode 100644 index 7df1820248..0000000000 --- a/mkspecs/features/qt_module_headers.prf +++ /dev/null @@ -1,311 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -load(qt_build_paths) - -!build_pass:git_build { - qtPrepareTool(QMAKE_SYNCQT, syncqt, , system) - minimal_syncqt { - QMAKE_SYNCQT += -minimal $$QMAKE_SYNCQT_OPTIONS - } else { - qtConfig(private_tests): \ # -developer-build - QMAKE_SYNCQT += -check-includes - } - for(mod, MODULE_INCNAME): \ - QMAKE_SYNCQT += -module $$mod - QMAKE_SYNCQT += \ - -version $$VERSION -outdir $$system_quote($$MODULE_BASE_OUTDIR) \ - -builddir $$system_quote($$REAL_MODULE_BASE_OUTDIR) $$MODULE_SYNCQT_DIR - !silent: message($$QMAKE_SYNCQT) - system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") - - !minimal_syncqt { - include-distclean.commands = \ - $$QMAKE_DEL_TREE $$shell_quote($$shell_path($$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME)) - QMAKE_EXTRA_TARGETS += include-distclean - DISTCLEAN_DEPS += include-distclean - } -} - -# Pre-generated headers in the source tree (tar-ball) and -# - shadow build or -# - non-shadow non-prefix build of a module which is not qtbase -# (because the build-time generated headers all end up in qtbase). -!git_build: \ - if(!equals(_PRO_FILE_PWD_, $$OUT_PWD) \ - |if(!prefix_build:!equals(MODULE_BASE_INDIR, $$[QT_HOST_PREFIX]))): \ - CONFIG += split_incpath - -# To avoid stuffing the code with repetetive conditionals, -# we parametrize the names of the variables we assign to. - -# Internal modules have no private part - they *are* private. -!internal_module: \ - prv = _PRIVATE - -# When doing a framework build with a prefix, the module needs to point -# into the frameworks' Headers dirs directly, as no shared include/ dir -# is installed. -# However, during the build, it needs to point into the shared include/ -# dir, as the framework doesn't even exist yet. For bootstrapped modules -# which borrow headers from "proper" modules, this situation persists -# even beyond the module's own build. The implication of this is that -# qmake might never use a framework's headers in a non-prefix build, -# as there is no separate set of .pri files for users outside Qt. -# Borrowing is assumed to happen from modules which, in a framework build, -# actually are frameworks. -prefix_build:module_frameworks: \ - fwd = _FWD -# When using a split include path during the build, the installed module's -# include path is also structurally different from that in the build dir. -prefix_build:split_incpath: \ - sfwd = _FWD - -ibase = \$\$QT_MODULE_INCLUDE_BASE -MODULE$${fwd}_INCLUDES = $$ibase -split_incpath { - bibase = $$val_escape(MODULE_BASE_OUTDIR)/include - MODULE$${sfwd}_INCLUDES += $$bibase -} -for(mod, MODULE_INCNAME) { - mibase = $$ibase/$$mod - MODULE$${fwd}_INCLUDES += $$mibase - MODULE$${fwd}$${prv}_INCLUDES += $$mibase/$$VERSION $$mibase/$$VERSION/$$mod - split_incpath { - mbibase = $$bibase/$$mod - MODULE$${sfwd}_INCLUDES += $$mbibase - generated_privates: \ - MODULE$${sfwd}$${prv}_INCLUDES += $$mbibase/$$VERSION $$mbibase/$$VERSION/$$mod - } - prefix_build:module_frameworks { - mfbase = \$\$QT_MODULE_LIB_BASE/$${mod}$${QT_LIBINFIX}.framework/Headers - MODULE_INCLUDES += $$mfbase - MODULE$${prv}_INCLUDES += $$mfbase/$$VERSION $$mfbase/$$VERSION/$$mod - } -} -MODULE_INCLUDES += $$MODULE_AUX_INCLUDES -MODULE_PRIVATE_INCLUDES += $$MODULE_PRIVATE_AUX_INCLUDES - -minimal_syncqt: return() - -defineTest(syncQtResolve) { - out = - for (f, SYNCQT.$$1): \ - out += $$absolute_path($$f, $$2) - SYNCQT.$$1 = $$out - export(SYNCQT.$$1) -} - -#load up the headers info -git_build: \ - INC_PATH = $$MODULE_BASE_OUTDIR -else: \ - INC_PATH = $$MODULE_BASE_INDIR -include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true) -syncQtResolve(HEADER_FILES, $$_PRO_FILE_PWD_) -syncQtResolve(PRIVATE_HEADER_FILES, $$_PRO_FILE_PWD_) -syncQtResolve(QPA_HEADER_FILES, $$_PRO_FILE_PWD_) -syncQtResolve(GENERATED_HEADER_FILES, $$INC_PATH/include/$$MODULE_INCNAME) -!lib_bundle: \ # Headers are embedded into the bundle, so don't install them separately. - CONFIG += qt_install_headers - -alien_syncqt: return() - -MODULE_INC_OUTDIR = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME - -isEmpty(MODULE_CFG_FILE): MODULE_CFG_FILE = qt$${MODULE}-config -exists($$OUT_PWD/$${MODULE_CFG_FILE}.h) { - fwd_rel = $$relative_path($$OUT_PWD, $$REAL_MODULE_BASE_OUTDIR) - SYNCQT.INJECTIONS += \ - $$fwd_rel/$${MODULE_CFG_FILE}.h:$${MODULE_CFG_FILE}.h \ - $$fwd_rel/$${MODULE_CFG_FILE}_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/$${MODULE_CFG_FILE}_p.h -} - -for (injection, SYNCQT.INJECTIONS) { - injects = $$split(injection, :) - dst_hdr = $$absolute_path($$member(injects, 0), $$REAL_MODULE_BASE_OUTDIR) - ofwd_hdr = $$member(injects, 1) - fwd_hdr = $$replace(ofwd_hdr, ^\\^, ) - MAIN_FWD = $$MODULE_INC_OUTDIR/$$fwd_hdr - MAIN_FWD_CONT = '$${LITERAL_HASH}include "$$relative_path($$dst_hdr, $$dirname(MAIN_FWD))"' - write_file($$MAIN_FWD, MAIN_FWD_CONT)|error() - equals(fwd_hdr, ofwd_hdr): touch($$MAIN_FWD, $$dst_hdr) - !git_build: QMAKE_DISTCLEAN += $$MAIN_FWD - !contains(ofwd_hdr, .*/private/.*): \ - SYNCQT.INJECTED_HEADER_FILES += $$dst_hdr - else: \ - SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$dst_hdr - injects = $$member(injects, 2, -1) - for (inject, injects) { - CLASS_FWD = $$MODULE_INC_OUTDIR/$$inject - CLASS_FWD_CONT = '$${LITERAL_HASH}include "$$fwd_hdr"' - write_file($$CLASS_FWD, CLASS_FWD_CONT)|error() - touch($$CLASS_FWD, $$MAIN_FWD) - !git_build: QMAKE_DISTCLEAN += $$CLASS_FWD - SYNCQT.INJECTED_HEADER_FILES += $$CLASS_FWD - } -} - -autogen_warning = \ - "/* This file was generated by qmake with the info from <root>/$$relative_path($$_PRO_FILE_, $$MODULE_BASE_INDIR). */" - -# Create a module master depends header -MODULE_MASTER_DEPS_HEADER = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$${MODULE_INCNAME}Depends -!build_pass { - MODULE_MASTER_DEPS_HEADER_CONT = $$autogen_warning - MODULE_MASTER_DEPS_HEADER_CONT += "$${LITERAL_HASH}ifdef __cplusplus /* create empty PCH in C mode */" - for(dep, MODULE_DEPENDS) { - depname = $$eval(QT.$${dep}.master_header) - isEmpty(depname): \ - depname = $$eval(QT.$${dep}.name) - MODULE_MASTER_DEPS_HEADER_CONT += "$${LITERAL_HASH}include <$$depname/$$depname>" - } - MODULE_MASTER_DEPS_HEADER_CONT += "$${LITERAL_HASH}endif" - write_file($$MODULE_MASTER_DEPS_HEADER, MODULE_MASTER_DEPS_HEADER_CONT)|error() - !git_build: QMAKE_DISTCLEAN += $$MODULE_MASTER_DEPS_HEADER -} -SYNCQT.HEADER_FILES += $$MODULE_MASTER_DEPS_HEADER - -# Automatically enable precompiled headers for Qt modules with more than 2 sources -combined_SOURCES = $$SOURCES $$OBJECTIVE_SOURCES -count(combined_SOURCES, 2, >) { - # except for Gcc/Windows: Larger precompiled headers crash cc1plus.exe - # (e.g. with i686-4.8.2-release-posix-dwarf-rt_v3-rev3) - !if(gcc:equals(QMAKE_HOST.os, Windows)):!equals(TEMPLATE, aux) { - !defined(PRECOMPILED_HEADER, "var"): PRECOMPILED_HEADER = $$MODULE_MASTER_DEPS_HEADER - } -} else { - CONFIG -= precompile_header -} -unset(combined_SOURCES) - -headersclean:!internal_module { - # Make sure that the header compiles with our strict options - hcleanDEFS = -DQT_NO_CAST_TO_ASCII=1 \ - -DQT_NO_CAST_FROM_ASCII=1 \ - -UQT_RESTRICTED_CAST_FROM_ASCII \ - -DQT_NO_URL_CAST_FROM_STRING=1 \ - -DQT_NO_CAST_FROM_BYTEARRAY=1 \ - -DQT_NO_KEYWORDS=1 \ - -DQT_USE_QSTRINGBUILDER \ - -DQT_USE_FAST_OPERATOR_PLUS \ - -Dsignals=int \ - -Dslots=int \ - -Demit=public: \ - -Dforeach=public: \ - -Dforever=public: - - gcc:!rim_qcc { - # Turn on some extra warnings not found in -Wall -Wextra. - # Common to GCC, Clang and ICC (and other compilers that masquerade as GCC): - hcleanFLAGS = -Wall -Wextra -Werror \ - -Woverloaded-virtual -Wshadow -Wundef -Wfloat-equal \ - -Wnon-virtual-dtor -Wpointer-arith -Wformat-security \ - -Wno-long-long -Wno-variadic-macros -pedantic-errors - - intel_icc { - # these warnings are disabled because explicit constructors with zero or - # multiple arguments are permitted in C++11: - # 2304: non-explicit constructor with single argument may cause implicit type conversion - # 2305: declaration of 'explicit' constructor without a single argument is redundant - hcleanFLAGS += -wd2304,2305 - greaterThan(QT_ICC_MAJOR_VERSION, 13) { - # ICC 14+ has a bug with -Wshadow, emitting it for cases where there's no shadowing - # (issue ID 0000698329, task DPD200245740) - hcleanFLAGS -= -Wshadow - } - } else { - # options accepted by GCC and Clang - hcleanFLAGS += -Wchar-subscripts -Wold-style-cast - - !contains(QT_ARCH, arm):!contains(QT_ARCH, mips): \ - hcleanFLAGS += -Wcast-align - - clang_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION} - versionAtLeast(clang_ver, 3.8): hcleanFLAGS += -Wdouble-promotion -Wshorten-64-to-32 - - !clang { - # options accepted only by GCC - - gcc_ver = $${QT_GCC_MAJOR_VERSION}.$${QT_GCC_MINOR_VERSION} - versionAtLeast(gcc_ver, 4.5): hcleanFLAGS += -Wdouble-promotion - versionAtLeast(gcc_ver, 4.9): hcleanFLAGS += -Wfloat-conversion - # GCC 9 has a lot of false positives relating to this, so disable completely - greaterThan(QT_GCC_MAJOR_VERSION, 8): hcleanFLAGS += -Wno-deprecated-copy - # GCC 9 introduced this - greaterThan(QT_GCC_MAJOR_VERSION, 8): hcleanFLAGS += -Wno-redundant-move - # GCC 9 introduced this - greaterThan(QT_GCC_MAJOR_VERSION, 8): hcleanFLAGS += -Wno-format-overflow - # GCC 9 introduced this - greaterThan(QT_GCC_MAJOR_VERSION, 8): hcleanFLAGS += -Wno-init-list-lifetime - - c++11 { - # only enabled for actual c++11 builds due to - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52806 - hcleanFLAGS += -Wzero-as-null-pointer-constant - } - } - } - - # Use strict mode C++11 or C++98, with no GNU extensions (see -pedantic-errors above). - # The module might set CONFIG += c++11, but it might also change QMAKE_CXXFLAGS_CXX11 - # or the module (or the mkspec) can set the C++11 flag on QMAKE_CXXFLAGS - # (or QMAKE_CXXFLAGS_{RELEASE,DEBUG} but that's unlikely). - c++11:contains(QMAKE_CXXFLAGS_CXX11, -std=gnu++11) { - hcleanFLAGS += -std=c++11 - } else: contains(QMAKE_CXXFLAGS, -std=gnu++11) { - hcleanFLAGS += -std=c++11 - } else: c++11:contains(QMAKE_CXXFLAGS_CXX11, -std=gnu++0x) { - hcleanFLAGS += -std=c++0x - } else: contains(QMAKE_CXXFLAGS, -std=gnu++0x) { - hcleanFLAGS += -std=c++0x - } else: !c++11:!contains(QMAKE_CXXFLAGS, -std=c++0x):!contains(QMAKE_CXXFLAGS, -std=c++11) { - hcleanFLAGS += -std=c++98 - } - - hcleanCOMMAND = $(CXX) -c $(CXXFLAGS) $$hcleanFLAGS $(INCPATH) $$hcleanDEFS -xc++ ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - } else: msvc:!intel_icl { - # 4180: qualifier applied to function type has no meaning; ignored - # 4458: declaration of 'identifier' hides class member - # -Za enables strict standards behavior, but we can't add it because - # <windows.h> and <GL.h> violate the standards. - hcleanFLAGS = -WX -W3 -wd4180 -wd4458 - - # MSVC 2015 (compiler version 19.0): - # 4577: 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed. Specify /EHsc - greaterThan(QMAKE_MSC_VER, 18): hcleanFLAGS += -wd4577 - - hcleanCOMMAND = $(CXX) -c $(CXXFLAGS) $$hcleanFLAGS $(INCPATH) $$hcleanDEFS -FI${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT} \ - $$[QT_INSTALL_DATA/src]/mkspecs/features/data/dummy.cpp - } - - !isEmpty(hcleanCOMMAND):if(!qtConfig(debug_and_release)|CONFIG(release, debug|release)) { - CLEAN_HEADERS = - for (h, SYNCQT.CLEAN_HEADER_FILES) { - hh = $$split(h, :) - hr = $$member(hh, 1) - isEmpty(hr)|qtConfig($$hr): \ - CLEAN_HEADERS += $$member(hh, 0) - } - CLEAN_HEADERS -= $$HEADERSCLEAN_EXCLUDE - header_check.dependency_type = TYPE_C - header_check.CONFIG += no_link - header_check.output = ${QMAKE_VAR_OBJECTS_DIR}header_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} - header_check.input = CLEAN_HEADERS - header_check.variable_out = PRE_TARGETDEPS - header_check.name = headercheck ${QMAKE_FILE_IN} - header_check.commands = $$hcleanCOMMAND - QMAKE_EXTRA_COMPILERS += header_check - } - unset(hcleanCOMMAND) - unset(hcleanFLAGS) - unset(hcleanDEFS) -} diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf deleted file mode 100644 index a8cc9835a5..0000000000 --- a/mkspecs/features/qt_module_pris.prf +++ /dev/null @@ -1,243 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -load(qt_build_paths) -force_independent|split_incpath: \ - CONFIG += need_fwd_pri -mod_work_pfx = $$MODULE_QMAKE_OUTDIR/mkspecs/modules -need_fwd_pri: \ - mod_inst_pfx = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst -else: \ - mod_inst_pfx = $$mod_work_pfx -!internal_module { - MODULE_ID = $$MODULE - mods_to_load = $$MODULE - !no_private_module { - MODULE_PRIVATE_PRI = $$mod_inst_pfx/qt_lib_$${MODULE}_private.pri - mods_to_load += $${MODULE}_private - } -} else { - MODULE_ID = $${MODULE}_private - mods_to_load = $${MODULE}_private -} -need_fwd_pri: \ - pris_to_load = $$MODULE_ID -else: \ - pris_to_load = $$mods_to_load -MODULE_PRI = $$mod_inst_pfx/qt_lib_$${MODULE_ID}.pri -MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri - -defineReplace(qtGetFeaturesForModule) { - enabled = $$unique(QT.$${1}.enabled_features) - disabled = $$unique(QT.$${1}.disabled_features) - result = \ - "QT.$${1}.enabled_features =$$join(enabled, " ", " ")" \ - "QT.$${1}.disabled_features =$$join(disabled, " ", " ")" - return($$result) -} - -defineReplace(qtGetExportsForModule) { - result = - for (var, QT.$${1}.exports): \ - result += "$$var = $$val_escape($$var)" - return($$result) -} - -defineReplace(qtExportDepsForModule) { - result = - for (lib, QT.$${1}.libraries) { - NAME = $$upper($$lib) - vars = \ - QMAKE_DEPENDS_$${NAME}_CC QMAKE_DEPENDS_$${NAME}_LD \ - QMAKE_DEFINES_$$NAME QMAKE_INCDIR_$$NAME - for (var, vars) { - expvar = $$var - expvar ~= s/^QMAKE_/QMAKE_EXPORT_/ - defined($$expvar, var):equals($$expvar, -): next() - !defined($$expvar, var): expvar = $$var - defined($$expvar, var): \ - result += "$$var = $$val_escape($$expvar)" - } - } - return($$result) -} - -defineReplace(qtExportLibsForModule) { - result = - for (lib, QT.$${1}.libraries) { - NAME = $$upper($$lib) - vars = \ - QMAKE_LIBS_$$NAME QMAKE_LIBS_$${NAME}_DEBUG QMAKE_LIBS_$${NAME}_RELEASE - for (var, vars) { - expvar = $$var - expvar ~= s/^QMAKE_/QMAKE_EXPORT_/ - defined($$expvar, var):equals($$expvar, -): next() - !defined($$expvar, var): expvar = $$var - defined($$expvar, var): \ - result += "$$var$${2} = $$val_escape($$expvar)" - } - } - return($$result) -} - -!build_pass { - - # Create a module .pri file - host_build: \ - module_libs = "\$\$QT_MODULE_HOST_LIB_BASE" - else: \ - module_libs = "\$\$QT_MODULE_LIB_BASE" - # In addition to the library's private deps, the private module's deps - # are logically runtime deps of the public module. - runtime_deps = $$QT_PRIVATE $$QT_FOR_PRIVATE - !isEmpty(runtime_deps): \ - module_rundep = "QT.$${MODULE_ID}.run_depends = $$replace(runtime_deps, -private$, _private)" - else: \ - module_rundep = - module_build_type = v2 - static: \ - module_build_type += staticlib - lib_bundle: \ - module_build_type += lib_bundle - module_frameworks: \ - MODULE_FRAMEWORKS = " \$\$QT_MODULE_LIB_BASE" - internal_module: \ - module_build_type += internal_module - ltcg: \ - module_build_type += ltcg - module_module = - !equals(TEMPLATE, aux) { - module_module = $$TARGET$$QT_LIBINFIX - !lib_bundle: module_module ~= s,^Qt,Qt$$QT_MAJOR_VERSION, - } - !isEmpty(MODULE_CONFIG): \ - module_config = "QT.$${MODULE_ID}.CONFIG = $$MODULE_CONFIG" - else: \ - module_config = - !isEmpty(MODULE_PLUGIN_TYPES): \ - module_plugtypes = "QT.$${MODULE_ID}.plugin_types = $$replace(MODULE_PLUGIN_TYPES, /[^.]+\\.[^.]+$, )" - else: \ - module_plugtypes = - !isEmpty(MODULE_MASTER_HEADER): \ - module_master = "QT.$${MODULE_ID}.master_header = $$MODULE_MASTER_HEADER" - else: \ - module_master = - MODULE_PRI_CONT = \ - "QT.$${MODULE_ID}.VERSION = $${VERSION}" \ - "" \ - "QT.$${MODULE_ID}.name = $$TARGET" \ - "QT.$${MODULE_ID}.module = $$module_module" \ - "QT.$${MODULE_ID}.libs = $$module_libs" \ - $$module_master \ - "QT.$${MODULE_ID}.includes = $$MODULE_INCLUDES" \ - "QT.$${MODULE_ID}.frameworks =$$MODULE_FRAMEWORKS" - !host_build: MODULE_PRI_CONT += \ - "QT.$${MODULE_ID}.bins = \$\$QT_MODULE_BIN_BASE" \ - $$module_plugtypes - MODULE_PRI_CONT += \ - "QT.$${MODULE_ID}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ - $$module_rundep \ - "QT.$${MODULE_ID}.uses =$$join(QMAKE_USE, " ", " ")" \ - "QT.$${MODULE_ID}.module_config =$$join(module_build_type, " ", " ")" \ - $$module_config \ - "QT.$${MODULE_ID}.DEFINES = $$val_escape(MODULE_DEFINES)" \ - $$qtGetFeaturesForModule($$MODULE_ID) \ - $$qtGetExportsForModule($$MODULE_ID) \ - "QT_CONFIG +=$$join(QT.$${MODULE_ID}.QT_CONFIG, " ", " ")" \ - "" \ - "QT_MODULES += $$MODULE" - write_file($$MODULE_PRI, MODULE_PRI_CONT)|error() - !internal_module:!no_private_module { - module_build_type += internal_module - private_deps = $$QT - private_deps -= $$MODULE_DEPENDS - private_deps += $$MODULE $$QT_FOR_PRIVATE - private_deps ~= s,-private$,_private,g - MODULE_PRIVATE_PRI_CONT = \ - "QT.$${MODULE}_private.VERSION = $${VERSION}" \ - "" \ - "QT.$${MODULE}_private.name = $${TARGET}" \ # Same name as base module - "QT.$${MODULE}_private.module =" \ - "QT.$${MODULE}_private.libs = $$module_libs" \ - "QT.$${MODULE}_private.includes = $$MODULE_PRIVATE_INCLUDES" \ - "QT.$${MODULE}_private.frameworks =" \ - "QT.$${MODULE}_private.depends = $$private_deps" \ - "QT.$${MODULE}_private.uses =$$join(QMAKE_USE_FOR_PRIVATE, " ", " ")" \ - "QT.$${MODULE}_private.module_config =$$join(module_build_type, " ", " ")" \ - $$qtGetFeaturesForModule($${MODULE}_private) \ - "" \ - $$qtExportDepsForModule($${MODULE}_private) \ - $$qtExportLibsForModule($${MODULE}_private) - write_file($$MODULE_PRIVATE_PRI, MODULE_PRIVATE_PRI_CONT)|error() - } - MODULE_PRI_FILES = $$MODULE_PRI $$MODULE_PRIVATE_PRI - - need_fwd_pri { - - !git_build: \ - MODULE_BASE_INCDIR = $$MODULE_BASE_INDIR - else: \ - MODULE_BASE_INCDIR = $$MODULE_BASE_OUTDIR - - # Create a forwarding module .pri file - MODULE_FWD_PRI_CONT = \ - "QT_MODULE_BIN_BASE = $$val_escape(MODULE_BASE_OUTDIR)/bin" \ - "QT_MODULE_INCLUDE_BASE = $$val_escape(MODULE_BASE_INCDIR)/include" \ - "QT_MODULE_LIB_BASE = $$val_escape(MODULE_BASE_OUTDIR)/lib" \ - "QT_MODULE_HOST_LIB_BASE = $$val_escape(MODULE_BASE_OUTDIR)/lib" \ - "include($$val_escape(MODULE_PRI))" \ - "QT.$${MODULE_ID}.priority = 1" - !internal_module:!no_private_module: MODULE_FWD_PRI_CONT += \ - "include($$val_escape(MODULE_PRIVATE_PRI))" \ - "QT.$${MODULE}_private.priority = 1" - !isEmpty(MODULE_FWD_INCLUDES) { - !lib_bundle: \ - pls = + - MODULE_FWD_PRI_CONT += \ - "QT.$${MODULE_ID}.includes $$pls= $$MODULE_FWD_INCLUDES" - !internal_module: \ - MODULE_FWD_PRI_CONT += \ - "QT.$${MODULE}_private.includes $$pls= $$MODULE_FWD_PRIVATE_INCLUDES" - } - write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error() - touch($$MODULE_FWD_PRI, $$MODULE_PRI) - MODULE_PRI_FILES += $$MODULE_FWD_PRI - - } else { - - # This is needed for the direct include() below. Mirrors qt_config.prf - QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] - QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] - QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] - QT_MODULE_HOST_LIB_BASE = $$[QT_HOST_LIBS] - - } - - # Then, inject the new module into the current cache state - !contains(QMAKE_INTERNAL_INCLUDED_FILES, $$MODULE_PRI): \ # before the actual include()! - cache(QMAKE_INTERNAL_INCLUDED_FILES, add transient, MODULE_PRI_FILES) - for(pri, pris_to_load): \ - include($$mod_work_pfx/qt_lib_$${pri}.pri) - for(mod, mods_to_load) { - for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \ - name module depends run_depends plugin_types module_config CONFIG DEFINES \ - priority includes bins libs frameworks \ - )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient) - } - cache(QT_MODULES, transient) - -} else:android:!no_private_module:!internal_module { - MODULE_PRIVATE_PRI_CONT = $$qtExportLibsForModule($${MODULE}_private, _$${QT_ARCH}) - write_file($$MODULE_PRIVATE_PRI, MODULE_PRIVATE_PRI_CONT, append)|error() -} - -# Schedule the regular .pri file for installation -CONFIG += qt_install_module diff --git a/mkspecs/features/qt_parts.prf b/mkspecs/features/qt_parts.prf deleted file mode 100644 index 579ade09c8..0000000000 --- a/mkspecs/features/qt_parts.prf +++ /dev/null @@ -1,77 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -# Ensure that each module has a .qmake.cache when properly qmake'd. -cache() - -load(qt_configure) - -load(qt_build_config) - -TEMPLATE = subdirs - -bp = $$eval($$upper($$TARGET)_BUILD_PARTS) -!isEmpty(bp): QT_BUILD_PARTS = $$bp - -exists($$_PRO_FILE_PWD_/src/src.pro) { - sub_src.subdir = src - sub_src.target = sub-src - SUBDIRS += sub_src - - exists($$_PRO_FILE_PWD_/tools/tools.pro) { - sub_tools.subdir = tools - sub_tools.target = sub-tools - sub_tools.depends = sub_src - # conditional treatment happens on a case-by-case basis - SUBDIRS += sub_tools - } -} - -exists($$_PRO_FILE_PWD_/examples/examples.pro) { - sub_examples.subdir = examples - sub_examples.target = sub-examples - contains(SUBDIRS, sub_src): sub_examples.depends = sub_src - contains(SUBDIRS, sub_tools): sub_examples.depends += sub_tools - !contains(QT_BUILD_PARTS, examples): sub_examples.CONFIG = no_default_target no_default_install - SUBDIRS += sub_examples -} - -exists($$_PRO_FILE_PWD_/tests/tests.pro) { - sub_tests.subdir = tests - sub_tests.target = sub-tests - contains(SUBDIRS, sub_src): sub_tests.depends = sub_src # The tests may have a run-time only dependency on other parts - contains(SUBDIRS, sub_tools): sub_tests.depends += sub_tools - sub_tests.CONFIG = no_default_install - !contains(QT_BUILD_PARTS, tests): sub_tests.CONFIG += no_default_target - SUBDIRS += sub_tests -} - -QT_BUILD_PARTS -= libs tools examples tests -!isEmpty(QT_BUILD_PARTS): warning("Unknown build part(s): $$QT_BUILD_PARTS") - -QMAKE_DISTCLEAN += \ - .qmake.cache \ - config.cache \ - config.log \ - mkspecs/modules/*.pri \ - mkspecs/modules-inst/*.pri - -tests = $$files($$_PRO_FILE_PWD_/config.tests/*.pro, true) -testdirs = -for (t, tests): \ - testdirs += $$relative_path($$dirname(t), $$_PRO_FILE_PWD_) -testdirs = $$unique(testdirs) -for (td, testdirs) { - t = $$basename(td)-distclean - $${t}.commands = -$$QMAKE_CD $$shell_path($$td) && $(MAKE) distclean - QMAKE_EXTRA_TARGETS += $$t - DISTCLEAN_DEPS += $$t -} diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf deleted file mode 100644 index 78b210a00c..0000000000 --- a/mkspecs/features/qt_plugin.prf +++ /dev/null @@ -1,103 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -load(qt_build_paths) - -isEmpty(PLUGIN_TYPE): error("PLUGIN_TYPE (plugins/ subdirectory) needs to be defined.") - -TEMPLATE = lib -CONFIG += plugin -DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE - -win32:CONFIG(shared, static|shared) { - # Embed a VERSIONINFO resource into the plugin's DLL. - isEmpty(VERSION): VERSION = $$QT_VERSION - CONFIG += skip_target_version_ext -} - -tool_plugin { - !build_pass:qtConfig(debug_and_release): CONFIG += release -} else:if(win32|mac):!macx-xcode { - qtConfig(debug_and_release): CONFIG += debug_and_release - qtConfig(build_all): CONFIG += build_all -} - -CONFIG += relative_qt_rpath # Qt's plugins should be relocatable - -# Qt libraries should only use Application Extension safe APIs -darwin:!no_app_extension_api_only: CONFIG += app_extension_api_only - -isEmpty(MODULE): MODULE = $$basename(TARGET) - -CONFIG(static, static|shared)|prefix_build { - mod_work_pfx = $$MODULE_QMAKE_OUTDIR/mkspecs/modules - force_independent: \ - mod_inst_pfx = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst - else: \ - mod_inst_pfx = $$mod_work_pfx - MODULE_PRI = $$mod_inst_pfx/qt_plugin_$${MODULE}.pri - MODULE_FWD_PRI = $$mod_work_pfx/qt_plugin_$${MODULE}.pri - - !build_pass { - qt_plugin_deps = $$QT $$QT_PRIVATE - qt_plugin_deps ~= s,-private$,_private,g - - MODULE_PRI_CONT = \ - "QT_PLUGIN.$${MODULE}.TYPE = $$PLUGIN_TYPE" \ - "QT_PLUGIN.$${MODULE}.EXTENDS =$$join(PLUGIN_EXTENDS, " ", " ")" \ - "QT_PLUGIN.$${MODULE}.DEPENDS = $$qt_plugin_deps" \ - "QT_PLUGIN.$${MODULE}.CLASS_NAME = $$PLUGIN_CLASS_NAME" \ - "QT_PLUGINS += $$MODULE" - write_file($$MODULE_PRI, MODULE_PRI_CONT)|error() - MODULE_PRI_FILES = $$MODULE_PRI - - force_independent { - - # Create a forwarding module .pri file - MODULE_FWD_PRI_CONT = \ - "QT_PLUGIN.$${MODULE}.PATH = $$MODULE_BASE_OUTDIR/plugins" \ - "include($$MODULE_PRI)" - write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error() - touch($$MODULE_FWD_PRI, $$MODULE_PRI) - MODULE_PRI_FILES += $$MODULE_FWD_PRI - - } - - # Then, inject the new module into the current cache state - !contains(QMAKE_INTERNAL_INCLUDED_FILES, $$MODULE_FWD_PRI): \ # before the actual include()! - cache(QMAKE_INTERNAL_INCLUDED_FILES, add transient, MODULE_PRI_FILES) - include($$MODULE_FWD_PRI) - for(var, $$list(TYPE EXTENDS CLASS_NAME PATH)): \ - defined(QT_PLUGIN.$${MODULE}.$$var, var): \ - cache(QT_PLUGIN.$${MODULE}.$$var, transient) - cache(QT_PLUGINS, transient) - } - - CONFIG(static, static|shared) { - pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules - pritarget.files = $$MODULE_PRI - INSTALLS += pritarget - } -} - -target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE -INSTALLS += target - -TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX, "plugins/$$PLUGIN_TYPE/") - -CONFIG += create_cmake - -DEFINES *= QT_DEPRECATED_WARNINGS - -load(qt_targets) -load(qt_common) - -QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF diff --git a/mkspecs/features/qt_prefix_build_check.prf b/mkspecs/features/qt_prefix_build_check.prf deleted file mode 100644 index 5b21efa367..0000000000 --- a/mkspecs/features/qt_prefix_build_check.prf +++ /dev/null @@ -1,21 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -defineTest(qtIsPrefixBuild) { - prefixdir = $$1 - # qtbase non-prefix build? - exists($$prefixdir/.qmake.cache)|exists($$prefixdir/CMakeCache.txt): \ - return(false) - # top-level non-prefix build? - contains(prefixdir, .*/qtbase):if(exists($$dirname(prefixdir)/.qmake.super)|exists($$dirname(prefixdir)/CMakeCache.txt)): \ - return(false) - return(true) -} diff --git a/mkspecs/features/qt_targets.prf b/mkspecs/features/qt_targets.prf deleted file mode 100644 index 3810d1e0ad..0000000000 --- a/mkspecs/features/qt_targets.prf +++ /dev/null @@ -1,4 +0,0 @@ -QMAKE_TARGET_COMPANY = The Qt Company Ltd. -isEmpty(QMAKE_TARGET_PRODUCT): QMAKE_TARGET_PRODUCT = Qt5 -isEmpty(QMAKE_TARGET_DESCRIPTION): QMAKE_TARGET_DESCRIPTION = C++ Application Development Framework -QMAKE_TARGET_COPYRIGHT = Copyright (C) 2020 The Qt Company Ltd. diff --git a/mkspecs/features/qt_test_helper.prf b/mkspecs/features/qt_test_helper.prf deleted file mode 100644 index 86b65dd884..0000000000 --- a/mkspecs/features/qt_test_helper.prf +++ /dev/null @@ -1,34 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -# If an auto test needs a helper application, this helper should -# be put into the same directory as the test itself. This common -# folder should be the test's "main directory" or a "debug" or "release" -# subfolder inside this main directory if debug_and_release is enabled. -# Additionally the helper's executable is suffixed with "_helper" to -# avoid name clashes with its folder. - -CONFIG += cmdline - -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../../debug/$${TARGET}_helper - } else { - TARGET = ../../release/$${TARGET}_helper - } -} else { - TARGET = ../$${TARGET}_helper -} - -parentFolder = $$dirname(_PRO_FILE_PWD_) -testFolder = $$basename(parentFolder) -target.path = $$[QT_INSTALL_TESTS]/$$testFolder -INSTALLS += target diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf deleted file mode 100644 index a8d589f0fa..0000000000 --- a/mkspecs/features/qt_tool.prf +++ /dev/null @@ -1,78 +0,0 @@ -# -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -CONFIG += no_launch_target -load(qt_app) - -CONFIG += console -DEFINES *= QT_USE_QSTRINGBUILDER - -# If we are doing a prefix build, create a "module" pri which enables -# qtPrepareTool() to work with the non-installed build. -# Non-bootstrapped tools always need this because of the environment setup. -!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)) { - isEmpty(MODULE):MODULE = $$TARGET - - load(qt_build_paths) - - TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri - - vars = binary depends - - !host_build|isEmpty(HOST_QT_TOOLS) { - load(resolve_target) - - !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) - - !isEmpty(QT_TOOL_ENV) { - vars += envvars - module_var_names = - module_var_sets = - for(var, QT_TOOL_ENV) { - vars += env.$${var}.name env.$${var}.value - module_var_names += QT_TOOL.$${MODULE}.env.$${var} - module_var_sets += \ - "QT_TOOL.$${MODULE}.env.$${var}.name = $$val_escape($${var}.name)" \ - "QT_TOOL.$${MODULE}.env.$${var}.value = $$val_escape($${var}.value)" - } - module_envvars = \ - "QT_TOOL.$${MODULE}.envvars = $$module_var_names" \ - $$module_var_sets - } else { - module_envvars = - } - - bin = $$system_path($$QMAKE_RESOLVED_TARGET) - } else { - bin = $${HOST_QT_TOOLS}/$${TARGET} - equals(QMAKE_HOST.os, Windows): bin = $${bin}.exe - bin = $$system_path($$bin) - } - - TOOL_PRI_CONT = \ - "QT_TOOL.$${MODULE}.binary = $$val_escape(bin)" \ - "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ - $$module_envvars - write_file($$TOOL_PRI, TOOL_PRI_CONT)|error() - - # Then, inject the new tool into the current cache state - !contains(QMAKE_INTERNAL_INCLUDED_FILES, $$TOOL_PRI) { # before the actual include()! - added = $$TOOL_PRI - cache(QMAKE_INTERNAL_INCLUDED_FILES, add transient, added) - unset(added) - } - include($$TOOL_PRI) - for(var, vars): \ - cache(QT_TOOL.$${MODULE}.$$var, transient) - -} -# The variable is re-used by qtPrepareTool(), and we really don't want that. -unset(QT_TOOL_ENV) diff --git a/mkspecs/features/qt_tracepoints.prf b/mkspecs/features/qt_tracepoints.prf deleted file mode 100644 index 56d315e1cd..0000000000 --- a/mkspecs/features/qt_tracepoints.prf +++ /dev/null @@ -1,54 +0,0 @@ -# W A R N I N G -# ------------- -# -# This file is not part of the Qt API. It exists purely as an -# implementation detail. It may change from version to version -# without notice, or even be removed. -# -# We mean it. -# - -qtPrepareTool(QMAKE_TRACEGEN, tracegen) - -isEmpty(TRACEGEN_DIR): TRACEGEN_DIR = . - -PROVIDER_NAME = qt$$lower($$MODULE) -INCLUDEPATH += $$absolute_path($$TRACEGEN_DIR, $$OUT_PWD) -HEADER_PATH = $$OUT_PWD/$$TRACEGEN_DIR/$${PROVIDER_NAME}_tracepoints_p$${first(QMAKE_EXT_H)} - -if(qtConfig(lttng)|qtConfig(etw)) { - SOURCE_PATH = $$OUT_PWD/$$TRACEGEN_DIR/$${PROVIDER_NAME}_tracepoints$${first(QMAKE_EXT_CPP)} - - isEmpty(BUILDS)|build_pass { - impl_file_contents = \ - "$${LITERAL_HASH}define TRACEPOINT_CREATE_PROBES" \ - "$${LITERAL_HASH}define TRACEPOINT_DEFINE" \ - "$${LITERAL_HASH}include \"$${HEADER_PATH}\"" - - write_file($$SOURCE_PATH, impl_file_contents)|error() - } - - GENERATED_SOURCES += $$SOURCE_PATH - - tracegen.input = TRACEPOINT_PROVIDER - tracegen.output = $$HEADER_PATH - tracegen.variable_out = HEADERS - tracegen.depends += $$QMAKE_TRACEGEN_EXE - tracegen.CONFIG = target_predeps - - qtConfig(lttng) { - tracegen.commands = $$QMAKE_TRACEGEN lttng ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - QMAKE_USE_PRIVATE += lttng-ust - } else { - tracegen.commands = $$QMAKE_TRACEGEN etw ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - } - - QMAKE_EXTRA_COMPILERS += tracegen - - DEFINES += Q_TRACEPOINT -} else { - isEmpty(BUILDS)|build_pass { - header_file_contents = "$${LITERAL_HASH}include <private/qtrace_p.h>" - write_file($$HEADER_PATH, header_file_contents)|error() - } -} diff --git a/mkspecs/features/resolve_target.prf b/mkspecs/features/resolve_target.prf index 1ef1dcfd1c..73a8a61a9c 100644 --- a/mkspecs/features/resolve_target.prf +++ b/mkspecs/features/resolve_target.prf @@ -56,9 +56,10 @@ win32 { framework_ext = $$QMAKE_BUNDLE_EXTENSION QMAKE_RESOLVED_BUNDLE = $${QMAKE_RESOLVED_TARGET}$${framework_target}$${framework_ext} !shallow_bundle { - TEMP_VERSION = $$section(VERSION, ., 0, 0) - isEmpty(TEMP_VERSION):TEMP_VERSION = A - QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_BUNDLE}/Versions/$${TEMP_VERSION}/$${TARGET} + framework_version = $$QMAKE_FRAMEWORK_VERSION + isEmpty(framework_version):framework_version = $$section(VERSION, ., 0, 0) + isEmpty(framework_version):framework_version = A + QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_BUNDLE}/Versions/$${framework_version}/$${TARGET} } else { QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_BUNDLE}/$${TARGET} } diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index 151051163d..ab9761a83c 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -1,9 +1,10 @@ -qtPrepareTool(QMAKE_RCC, rcc, _DEP) +qtPrepareLibExecTool(QMAKE_RCC, rcc, _DEP) isEmpty(QMAKE_MOD_RCC):QMAKE_MOD_RCC = qrc !contains(QMAKE_RESOURCE_FLAGS, -root):!isEmpty(QMAKE_RESOURCE_ROOT):QMAKE_RESOURCE_FLAGS += -root $$QMAKE_RESOURCE_ROOT !contains(QMAKE_RESOURCE_FLAGS, -name): QMAKE_RESOURCE_FLAGS += -name ${QMAKE_FILE_BASE} +!qtConfig(zstd): QMAKE_RESOURCE_FLAGS += --no-zstd load(resources_functions) qtFlattenResources() @@ -12,7 +13,7 @@ qtEnsurePluginResourcesCpp() rcc.input = RESOURCES rcc.name = RCC ${QMAKE_FILE_IN} rcc.depend_command = $$QMAKE_RCC_DEP -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} -rcc.CONFIG += add_inputs_as_makefile_deps dep_lines +rcc.CONFIG += add_inputs_as_makefile_deps dep_lines remove_no_exist !resources_big|ltcg|macx-xcode|wasm|contains(TEMPLATE, "vc.*") { diff --git a/mkspecs/features/resources_functions.prf b/mkspecs/features/resources_functions.prf index 9b7c409121..b525f482ca 100644 --- a/mkspecs/features/resources_functions.prf +++ b/mkspecs/features/resources_functions.prf @@ -35,10 +35,10 @@ defineTest(qtFlattenResources) { } RESOURCES -= $$resource - !android|isEmpty(BUILDS)|build_pass { + isEmpty(BUILDS)|build_pass { resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) RESOURCES += $$resource_file - } else { + } else: android { # Android will need a resource file for each architecture make sure it is placed # correctly for other functions that need the right paths for these files for (arch, ANDROID_ABIS) { @@ -67,6 +67,12 @@ defineTest(qtFlattenResources) { for (file, files) { exists($$file/*): next() # exclude directories alias = $$relative_path($$file, $$abs_base) + + # If a resource is added by the build system from outside of $$_PRO_FILE_PWD_ + # everything except the filename needs to be discarded. + subdir = $$find(alias, ^../) + if (!isEmpty(subdir)): alias = $$basename(file) + resource_file_content += \ "<file alias=\"$$xml_escape($$alias)\">$$xml_escape($$file)</file>" OTHER_FILES *= $$file @@ -107,7 +113,7 @@ defineTest(qtEnsurePluginResourcesCpp) { RESOURCE_INIT_CONT = \ "// This file is autogenerated by qmake. It contains a function that" \ "// references all resources the plugin includes and the function is" \ - "// referenced by Qt_(MOC_)EXPORT_PLUGIN to ensure the inclusion in" \ + "// referenced by QT_(MOC_)EXPORT_PLUGIN to ensure the inclusion in" \ "// the statically linked plugin." \ "$${LITERAL_HASH}include <QtCore/qglobal.h>" \ "void $${resource_init_function}() " \ diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 4cce55fe04..ca9bfb55f8 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -63,33 +63,41 @@ debug_and_release:debug_and_release_target { # Allow for a custom test runner script android: isEmpty($(TESTRUNNER)) { - APK_PATH = $$shell_path($$OUT_PWD/android-build/$${TARGET}.apk) - qtPrepareTool(ANDROIDTESTRUNNER, androidtestrunner) - qtPrepareTool(ANDROIDDEPLOYQT, androiddeployqt) - isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET-deployment-settings.json - contains(QMAKE_HOST.os, Windows): extension = .exe - $${type}.commands = $$ANDROIDTESTRUNNER --androiddeployqt \"$$ANDROIDDEPLOYQT --input $$ANDROID_DEPLOYMENT_SETTINGS_FILE\" - $${type}.commands += --path \"$$OUT_PWD/android-build\" - $${type}.commands += --adb \"$$shell_path($${ANDROID_SDK_ROOT}$${QMAKE_DIR_SEP}platform-tools$${QMAKE_DIR_SEP}adb$${extension})\" - $${type}.commands += --make \"$(MAKE) -f $(MAKEFILE)\" - $${type}.commands += --apk $$APK_PATH -} else: $${type}.commands += $(TESTRUNNER) - -unix { - isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = . - - app_bundle: \ - $${type}.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) - else: !android: \ - $${type}.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET) + build_pass|single_android_abi { + APK_PATH = $$shell_path($$OUT_PWD/android-build/$${TARGET}.apk) + qtPrepareTool(ANDROIDTESTRUNNER, androidtestrunner) + qtPrepareTool(ANDROIDDEPLOYQT, androiddeployqt) + isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET-deployment-settings.json + contains(QMAKE_HOST.os, Windows): extension = .exe + $${type}.commands = $$ANDROIDTESTRUNNER --path \"$$OUT_PWD/android-build\" + $${type}.commands += --adb \"$$shell_path($${ANDROID_SDK_ROOT}$${QMAKE_DIR_SEP}platform-tools$${QMAKE_DIR_SEP}adb$${extension})\" + $${type}.commands += --make \"$(MAKE) apk\" + $${type}.commands += --apk $$APK_PATH + # Allow for custom arguments to tests + !catch: $${type}.commands += $(TESTARGS) + $${type}.commands += "--" + for(import, IMPORTPATH): $${type}.commands *= -import \"assets:/$$basename(_PRO_FILE_PWD_)/$$import\" + } else { + $${type}.commands = "echo \"Pass\"" + } } else { - # Windows - !isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = $$shell_path($$TEST_TARGET_DIR)$${QMAKE_DIR_SEP} - $${type}.commands += $${TEST_TARGET_DIR}$(TARGET) -} + $${type}.commands += $(TESTRUNNER) + + unix { + isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = . -# Allow for custom arguments to tests -!catch: $${type}.commands += $(TESTARGS) + app_bundle: \ + $${type}.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) + else: !android: \ + $${type}.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET) + } else { + # Windows + !isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = $$shell_path($$TEST_TARGET_DIR)$${QMAKE_DIR_SEP} + $${type}.commands += $${TEST_TARGET_DIR}$(TARGET) + } + # Allow for custom arguments to tests + !catch: $${type}.commands += $(TESTARGS) +} !isEmpty(TESTRUN_CWD):!contains(TESTRUN_CWD, ^\\./?): \ $${type}.commands = $$QMAKE_CD $$shell_path($$TESTRUN_CWD) && $$eval($${type}.commands) diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index e03c21dea2..13bf7f12ac 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -182,6 +182,15 @@ isEmpty($${target_prefix}.INCDIRS) { # UIKit simulator platforms will see the device SDK's sysroot in # QMAKE_DEFAULT_*DIRS, because they're handled in a single build pass. darwin { + uikit:!isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { + # Clang doesn't automatically pick up the architecture, just because + # we're passing the iOS sysroot below, and we will end up building the + # test for the host architecture, resulting in linker errors when + # linking against the iOS libraries. We work around this by passing + # the architecture explicitly. + cxx_flags += -arch $$first(QMAKE_APPLE_DEVICE_ARCHS) + } + uikit:macx-xcode: \ cxx_flags += -isysroot $$sdk_path_device.value else: \ @@ -279,9 +288,12 @@ isEmpty($${target_prefix}.INCDIRS) { } } } - isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \ + isEmpty(QMAKE_DEFAULT_INCDIRS): \ !integrity: \ - error("failed to parse default search paths from compiler output") + error("failed to parse default include paths from compiler output") + isEmpty(QMAKE_DEFAULT_LIBDIRS): \ + !integrity:!darwin: \ + error("failed to parse default library paths from compiler output") QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS) } else: ghs { cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp @@ -322,9 +334,17 @@ isEmpty($${target_prefix}.INCDIRS) { error("Mkspec does not specify MSVC_VER. Cannot continue.") versionAtLeast(MSVC_VER, 15.0) { dir = $$(VSINSTALLDIR) - isEmpty(dir): \ - dir = $$read_registry(HKLM, \ - "Software\\Microsoft\\VisualStudio\\SxS\\VS7\\$$MSVC_VER", 32) + isEmpty(dir) { + version_parts = $$split(MSVC_VER, .) + MSVC_NEXT_MAJOR = $$num_add($$first(version_parts), 1) + vswhere = "$$getenv(ProgramFiles\(x86\))/Microsoft Visual Studio/Installer/vswhere.exe" + !exists($$vswhere): \ + error("Could not find $$vswhere") + vswhere = $$system_quote($$system_path($$vswhere)) + # -version parameter: A version range for instances to find. 15.0 will get all versions >= 15.0 + # Example: [15.0,16.0) will find versions 15.*. + dir = $$system("$$vswhere -latest -version [$$MSVC_VER,$${MSVC_NEXT_MAJOR}.0] -property installationPath") + } isEmpty(dir): \ error("Failed to find the Visual Studio installation directory.") cmd += $$system_quote($$dir\\VC\\Auxiliary\\Build\\vcvarsall.bat) $$arch @@ -394,7 +414,7 @@ isEmpty($${target_prefix}.INCDIRS) { QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP) } - unix:if(!cross_compile|host_build) { + unix:!darwin:if(!cross_compile|host_build) { isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib } diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index a5df0c7e8d..fe9ad4b6c9 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -1,4 +1,4 @@ -qtPrepareTool(QMAKE_UIC, uic, _DEP) +qtPrepareLibExecTool(QMAKE_UIC, uic, _DEP) isEmpty(UI_DIR):UI_DIR = . isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf index 80c1fc66cd..a731cd0cbe 100644 --- a/mkspecs/features/uikit/default_post.prf +++ b/mkspecs/features/uikit/default_post.prf @@ -28,7 +28,7 @@ macx-xcode { device_family.value = $$QMAKE_APPLE_TARGETED_DEVICE_FAMILY QMAKE_MAC_XCODE_SETTINGS += device_family - ios { + equals(TEMPLATE, app):ios { isEmpty(QMAKE_IOS_LAUNCH_SCREEN) { qmake_launch_screen = LaunchScreen.storyboard qmake_copy_launch_screen.input = $$QMAKESPEC/$$qmake_launch_screen @@ -40,6 +40,18 @@ macx-xcode { } QMAKE_BUNDLE_DATA += qmake_launch_screens } + + !qtConfig(simulator_and_device) { + # Single SDK builds only support the target we built + supported_platforms.name = SUPPORTED_PLATFORMS + supported_platforms.value = $$QMAKE_MAC_SDK + QMAKE_MAC_XCODE_SETTINGS += supported_platforms + } + + # In a simulator specific build the device config will set the SDK + # to the simulator SDK, but for Xcode we always want the SDKROOT + # to be the device SDK. + QMAKE_MAC_SDK = $$device.sdk } !xcodebuild:equals(TEMPLATE, app):!isEmpty(QMAKE_INFO_PLIST) { diff --git a/mkspecs/features/uikit/default_pre.prf b/mkspecs/features/uikit/default_pre.prf index ea6882fbc8..4a7c0820d0 100644 --- a/mkspecs/features/uikit/default_pre.prf +++ b/mkspecs/features/uikit/default_pre.prf @@ -7,14 +7,7 @@ $$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${device.sdk}.*): \ $$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \ CONFIG += simulator $${simulator.sdk} -$$sim_and_dev { - # For a simulator_and_device build all the config tests - # are based on the device's ARM SDK, but we know that the simulator - # is Intel and that we support SSE/SSE2. - QT_CPU_FEATURES.$$QT_ARCH += sse sse2 - CONFIG += sse sse2 - DEFINES += QT_COMPILER_SUPPORTS_SSE2 -} +CONFIG += entrypoint unset(sim_and_dev) diff --git a/mkspecs/features/uikit/device_destinations.sh b/mkspecs/features/uikit/device_destinations.sh index 649dd399a7..dbbdc1d005 100755 --- a/mkspecs/features/uikit/device_destinations.sh +++ b/mkspecs/features/uikit/device_destinations.sh @@ -1,43 +1,6 @@ #!/bin/bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is the build configuration utility of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 3 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL3 included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 3 requirements -## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 2.0 or (at your option) the GNU General -## Public license version 3 or any later version approved by the KDE Free -## Qt Foundation. The licenses are as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-2.0.html and -## https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2016 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" scheme=$1 diff --git a/mkspecs/features/uikit/devices.py b/mkspecs/features/uikit/devices.py index 8cdcb370a0..18855be58e 100755 --- a/mkspecs/features/uikit/devices.py +++ b/mkspecs/features/uikit/devices.py @@ -1,43 +1,6 @@ -#!/usr/bin/python - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is the build configuration utility of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 3 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL3 included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 3 requirements -## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 2.0 or (at your option) the GNU General -## Public license version 3 or any later version approved by the KDE Free -## Qt Foundation. The licenses are as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-2.0.html and -## https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +#!/usr/bin/env python3 +# Copyright (C) 2017 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 from __future__ import print_function diff --git a/mkspecs/features/uikit/qt.prf b/mkspecs/features/uikit/qt.prf deleted file mode 100644 index 4475c137dc..0000000000 --- a/mkspecs/features/uikit/qt.prf +++ /dev/null @@ -1,33 +0,0 @@ - -qt_depends = $$resolve_depends(QT, "QT.") -!watchos:equals(TEMPLATE, app):contains(qt_depends, gui(-private)?) { - LIBS *= -L$$[QT_INSTALL_PLUGINS/get]/platforms - - lib_name = qios - lib_path_and_base = $$[QT_INSTALL_PLUGINS/get]/platforms/lib$${lib_name}$$qtPlatformTargetSuffix() - LIBS += -l$${lib_name}$$qtPlatformTargetSuffix() $$fromfile($${lib_path_and_base}.prl, QMAKE_PRL_LIBS) - - !bitcode { - # By marking qt_registerPlatformPlugin as undefined, we ensure that - # the plugin.o translation unit is considered for inclusion in - # the final binary, which in turn ensures that the plugin's - # static initializer is included and run. - QMAKE_LFLAGS += -u _qt_registerPlatformPlugin - - # We do link and dependency resolution for the platform plugin - # manually, since we know we always need the plugin, so we don't - # need to generate an import for it. - QTPLUGIN.platforms = - - } - - !no_main_wrapper { - # The LC_MAIN load command available in iOS 6.0 and above allows dyld to - # directly call the entrypoint instead of going through _start in crt.o. - # Passing -e to the linker changes the entrypoint from _main to our custom - # wrapper that calls UIApplicationMain and dispatches back to main() once - # the application has started up and is ready to initialize QApplication. - QMAKE_LFLAGS += -Wl,-e,_qt_main_wrapper - } -} - -load(qt) diff --git a/mkspecs/features/uikit/qt_parts.prf b/mkspecs/features/uikit/qt_parts.prf deleted file mode 100644 index 81814a62b0..0000000000 --- a/mkspecs/features/uikit/qt_parts.prf +++ /dev/null @@ -1,5 +0,0 @@ - -# Disable tests for anything but qtbase for now -!equals(TARGET, qtbase): QT_BUILD_PARTS -= tests - -load(qt_parts) diff --git a/mkspecs/features/uikit/xcodebuild.mk b/mkspecs/features/uikit/xcodebuild.mk index e1156d0e76..4416240cf2 100644 --- a/mkspecs/features/uikit/xcodebuild.mk +++ b/mkspecs/features/uikit/xcodebuild.mk @@ -58,7 +58,7 @@ debug-%: CONFIGURATION = Debug MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST))) -# Test and build (device) destinations +# Test device destinations ifneq ($(filter check%,$(MAKECMDGOALS)),) ifeq ($(DEVICES),) $(info Enumerating test destinations (you may override this by setting DEVICES explicitly), please wait...) @@ -72,10 +72,10 @@ endif %-device: DEVICES = $(HARDWARE_DEVICES) GENERIC_DEVICE_DESTINATION := $(EXPORT_GENERIC_DEVICE_DESTINATION) -GENERIC_SIMULATOR_DESTINATION := "id=$(shell $(MAKEFILE_DIR)devices.py $(EXPORT_DEVICE_FILTER) | tail -n 1)" +GENERIC_SIMULATOR_DESTINATION := $(EXPORT_GENERIC_SIMULATOR_DESTINATION) -%-simulator: DESTINATION = $(if $(DESTINATION_ID),"id=$(DESTINATION_ID)",$(GENERIC_SIMULATOR_DESTINATION)) -%-device: DESTINATION = $(if $(DESTINATION_ID),"id=$(DESTINATION_ID)",$(GENERIC_DEVICE_DESTINATION)) +%-simulator: DESTINATION = $(if $(DESTINATION_ID),"id=$(DESTINATION_ID)","$(GENERIC_SIMULATOR_DESTINATION)") +%-device: DESTINATION = $(if $(DESTINATION_ID),"id=$(DESTINATION_ID)","$(GENERIC_DEVICE_DESTINATION)") XCODE_VERSION_MAJOR := $(shell xcodebuild -version | grep Xcode | sed -e 's/Xcode //' | sed -e 's/\..*//') @@ -83,6 +83,10 @@ ifeq ($(shell test $(XCODE_VERSION_MAJOR) -gt 7; echo $$?),0) XCODEBUILD_FLAGS += $(shell echo "$(MAKEFLAGS)" | sed -e 's/\([^ ]*\).*/\1/' | grep -qv 's' || echo -quiet) endif +ifeq ($(shell test $(XCODE_VERSION_MAJOR) -ge 9; echo $$?),0) + XCODEBUILD_FLAGS += -allowProvisioningUpdates +endif + # Xcodebuild DESTINATION_MESSAGE = "Running $(call tolower,$(CONFIGURATION)) $(ACTION) \ diff --git a/mkspecs/features/uikit/xcodebuild.prf b/mkspecs/features/uikit/xcodebuild.prf index 01022c7b99..ddf606cda4 100644 --- a/mkspecs/features/uikit/xcodebuild.prf +++ b/mkspecs/features/uikit/xcodebuild.prf @@ -53,7 +53,13 @@ watchos { DEVICE_FILTER = --platform watchOS --minimum-deployment-target $$QMAKE_WATCHOS_DEPLOYMENT_TARGET GENERIC_DEVICE_DESTINATION = "generic/platform=watchOS" } -QMAKE_EXTRA_VARIABLES += DEVICE_SDK SIMULATOR_SDK DEVICE_FILTER GENERIC_DEVICE_DESTINATION +GENERIC_SIMULATOR_DESTINATION = "$$GENERIC_DEVICE_DESTINATION Simulator" + +QMAKE_EXTRA_VARIABLES += \ + DEVICE_SDK SIMULATOR_SDK \ + DEVICE_FILTER \ + GENERIC_DEVICE_DESTINATION \ + GENERIC_SIMULATOR_DESTINATION QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/xcodebuild.mk) diff --git a/mkspecs/features/unix/no_direct_extern_access.prf b/mkspecs/features/unix/no_direct_extern_access.prf new file mode 100644 index 0000000000..2b7b3c8539 --- /dev/null +++ b/mkspecs/features/unix/no_direct_extern_access.prf @@ -0,0 +1,7 @@ +clang { + QMAKE_CFLAGS += -fno-direct-access-external-data + QMAKE_CXXFLAGS += -fno-direct-access-external-data +} else { + QMAKE_CFLAGS += -mno-direct-extern-access + QMAKE_CXXFLAGS += -mno-direct-extern-access +} diff --git a/mkspecs/features/wasm/emcc_ver.prf b/mkspecs/features/wasm/emcc_ver.prf index 3605651494..11a2408a9b 100644 --- a/mkspecs/features/wasm/emcc_ver.prf +++ b/mkspecs/features/wasm/emcc_ver.prf @@ -1,5 +1,5 @@ defineReplace(qtEmccRecommendedVersion) { - return (1.39.8) + return (3.1.50) } defineReplace(qtSystemEmccVersion) { diff --git a/mkspecs/features/wasm/wasm.prf b/mkspecs/features/wasm/wasm.prf index 2e886fc4a5..c1a1a3a73e 100644 --- a/mkspecs/features/wasm/wasm.prf +++ b/mkspecs/features/wasm/wasm.prf @@ -1,4 +1,5 @@ +QT_FOR_CONFIG += core-private # DESTDIR will be empty if not set in the app .pro file; make sure it has a value isEmpty(DESTDIR): DESTDIR = $$OUT_PWD @@ -6,40 +7,76 @@ isEmpty(DESTDIR): DESTDIR = $$OUT_PWD exists($$QMAKE_QT_CONFIG) { ## this may be subject to change + ## qmake puts a space if done otherwise + !isEmpty(QT_WASM_EXTRA_EXPORTED_METHODS): { + EXPORTED_METHODS = UTF16ToString,stringToUTF16,JSEvents,specialHTMLTargets,FS,callMain,$$QT_WASM_EXTRA_EXPORTED_METHODS + } else { + EXPORTED_METHODS = UTF16ToString,stringToUTF16,JSEvents,specialHTMLTargets,FS,callMain + } + EMCC_LFLAGS += -s EXPORTED_RUNTIME_METHODS=$$EXPORTED_METHODS + + !isEmpty(QT_WASM_EXPORT_NAME): { + EXPORT_NAME = $$QT_WASM_EXPORT_NAME + } else { + TARGET_SANITIZED = $$replace(TARGET, [^a-zA-Z0-9_], _) + EXPORT_NAME = $${TARGET_SANITIZED}_entry + } + + EMCC_LFLAGS += -s EXPORT_NAME=$$EXPORT_NAME + qtConfig(thread) { - EMCC_THREAD_LFLAGS += -s USE_PTHREADS=1 + EMCC_LFLAGS += -pthread + EMCC_CFLAGS += -pthread # Create worker threads at startup. This is supposed to be an optimization, # however exceeding the pool size has been obesverved to hang the application. POOL_SIZE = 4 - !isEmpty(QMAKE_WASM_PTHREAD_POOL_SIZE) { - POOL_SIZE = $$QMAKE_WASM_PTHREAD_POOL_SIZE + !isEmpty(QT_WASM_PTHREAD_POOL_SIZE) { + POOL_SIZE = $$QT_WASM_PTHREAD_POOL_SIZE } message("Setting PTHREAD_POOL_SIZE to" $$POOL_SIZE) - EMCC_THREAD_LFLAGS += -s PTHREAD_POOL_SIZE=$$POOL_SIZE + EMCC_LFLAGS += -s PTHREAD_POOL_SIZE=$$POOL_SIZE + } + + # Set memory options + EMCC_LFLAGS += -sALLOW_MEMORY_GROWTH + isEmpty(QT_WASM_INITIAL_MEMORY) { + INITIAL_MEMORY = 50MB # emscripten default is 16MB, we need slightly more + } else { + INITIAL_MEMORY = $$QT_WASM_INITIAL_MEMORY + } + EMCC_LFLAGS += -s INITIAL_MEMORY=$$INITIAL_MEMORY + isEmpty(QT_WASM_MAXIMUM_MEMORY) { + MAXIMUM_MEMORY = 4GB # 32-bit max } else { - EMCC_THREAD_LFLAGS += -s ALLOW_MEMORY_GROWTH=1 + MAXIMUM_MEMORY = $$QT_WASM_MAXIMUM_MEMORY } + EMCC_LFLAGS += -s MAXIMUM_MEMORY=$$MAXIMUM_MEMORY - qtConfig(thread) | !isEmpty(QMAKE_WASM_TOTAL_MEMORY) { - - # Hardcode wasm memory size. Emscripten does not currently support memory growth - # (ALLOW_MEMORY_GROWTH) in pthreads mode, and requires specifying the memory size - # at build time. Further, browsers limit the maximum initial memory size to 1GB. - # QMAKE_WASM_TOTAL_MEMORY must be a multiple of 64KB - TOTAL_MEMORY = 1GB - !isEmpty(QMAKE_WASM_TOTAL_MEMORY) { - TOTAL_MEMORY = $$QMAKE_WASM_TOTAL_MEMORY - } - message("Setting TOTAL_MEMORY to" $$TOTAL_MEMORY) - EMCC_THREAD_LFLAGS += -s TOTAL_MEMORY=$$TOTAL_MEMORY + qtConfig(sse2) { + QMAKE_CFLAGS += -O2 -msimd128 -msse -msse2 + QMAKE_CXXFLAGS += -O2 -msimd128 -msse -msse2 + QMAKE_LFLAGS += -msimd128 -msse -msse2 + QMAKE_LFLAGS_DEBUG += -msimd128 -msse -msse2 } - QMAKE_LFLAGS += $$EMCC_THREAD_LFLAGS - QMAKE_LFLAGS_DEBUG += $$EMCC_THREAD_LFLAGS - QMAKE_CFLAGS += $$EMCC_THREAD_LFLAGS - QMAKE_CXXFLAGS += $$EMCC_THREAD_LFLAGS + + qtConfig(shared) { + contains(TEMPLATE, .*app) { + EMCC_MODULE_FLAGS = -s MAIN_MODULE=1 + } + contains(TEMPLATE, .*lib):!static: { + EMCC_MODULE_FLAGS = -s SIDE_MODULE=1 + } + EMCC_CFLAGS += $$EMCC_MODULE_FLAGS + EMCC_LFLAGS += $$EMCC_MODULE_FLAGS + } + + QMAKE_LFLAGS += $$EMCC_LFLAGS + QMAKE_LFLAGS_DEBUG += $$EMCC_LFLAGS + QMAKE_CFLAGS += $$EMCC_CFLAGS + QMAKE_CXXFLAGS += $$EMCC_CFLAGS } # Create js and wasm files for applications @@ -70,11 +107,16 @@ contains(TEMPLATE, .*app) { WASM_PLUGIN_PATH = $$PWD/../../../src/plugins/platforms/wasm } + PRELOAD = "" + shared { + PRELOAD = "preload:\ ['qt_plugins.json',\ 'qt_qml_imports.json']," + } + # Copy/Generate main .html file (e.g. myapp.html) from the webassembly_shell.html by # replacing the app name placeholder with the actual app name. apphtml.name = application main html file apphtml.output = $$DESTDIR/$$TARGET_HTML - apphtml.commands = $$QMAKE_STREAM_EDITOR -e s/@APPNAME@/$$TARGET_BASE/g $$WASM_PLUGIN_PATH/wasm_shell.html > $$DESTDIR/$$TARGET_HTML + apphtml.commands = $$QMAKE_STREAM_EDITOR -e s/@APPNAME@/$$TARGET_BASE/g -e s/@APPEXPORTNAME@/$$EXPORT_NAME/g -e s/@PRELOAD@/$$PRELOAD/g $$WASM_PLUGIN_PATH/wasm_shell.html > $$DESTDIR/$$TARGET_HTML apphtml.input = $$WASM_PLUGIN_PATH/wasm_shell.html apphtml.depends = $$apphtml.input QMAKE_EXTRA_COMPILERS += apphtml @@ -114,12 +156,19 @@ contains(TEMPLATE, .*app) { qtConfTest_emccVersion() -# Pass --source-map-base on the linker line. This informs the -# browser where to find the source files when debugging. -WASM_SOURCE_MAP_BASE = http://localhost:8000/ -!isEmpty(QMAKE_WASM_SOURCE_MAP_BASE):\ - WASM_SOURCE_MAP_BASE = $$QMAKE_WASM_SOURCE_MAP_BASE -CONFIG(debug): QMAKE_LFLAGS += --source-map-base $$WASM_SOURCE_MAP_BASE +CONFIG(debug):!isEmpty(QT_WASM_SOURCE_MAP) { + + EMCC_VERSION = $$qtSystemEmccVersion() + + QMAKE_LFLAGS += -gsource-map + # Pass --source-map-base on the linker line. This informs the + # browser where to find the source files when debugging. + WASM_SOURCE_MAP_BASE = http://localhost:8000/ + !isEmpty(QT_WASM_SOURCE_MAP_BASE):\ + WASM_SOURCE_MAP_BASE = $$QT_WASM_SOURCE_MAP_BASE + QMAKE_LFLAGS += --source-map-base $$WASM_SOURCE_MAP_BASE +} + # Creates the stand-alone version of the library from bitcode !static:contains(TEMPLATE, .*lib): { diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf index cb781653de..08b3103f28 100644 --- a/mkspecs/features/wayland-scanner.prf +++ b/mkspecs/features/wayland-scanner.prf @@ -42,7 +42,7 @@ wayland_code.commands = $$QMAKE_WAYLAND_SCANNER --strict --include-core-only pub silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands QMAKE_EXTRA_COMPILERS += wayland_code -qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) +qtPrepareLibExecTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) qtwayland_client_header.name = qtwayland ${QMAKE_FILE_BASE} qtwayland_client_header.input = WAYLANDCLIENTSOURCES WAYLANDCLIENTSOURCES_SYSTEM diff --git a/mkspecs/features/win32/default_pre.prf b/mkspecs/features/win32/default_pre.prf index 4bd1653aee..be8e20130f 100644 --- a/mkspecs/features/win32/default_pre.prf +++ b/mkspecs/features/win32/default_pre.prf @@ -1,2 +1,2 @@ -CONFIG = windows $$CONFIG +CONFIG = windows $$CONFIG entrypoint load(default_pre) diff --git a/mkspecs/features/win32/idcidl.prf b/mkspecs/features/win32/idcidl.prf index 922ae3f99e..67d3cf0cb0 100644 --- a/mkspecs/features/win32/idcidl.prf +++ b/mkspecs/features/win32/idcidl.prf @@ -3,8 +3,7 @@ build_pass:console { warning("Remove 'console' from your CONFIG.") } -# Do not link qtmain.lib -QMAKE_LIBS_QT_ENTRY = +CONFIG -= entrypoint ACTIVEQT_VERSION = $$VERSION isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0 diff --git a/mkspecs/features/win32/qt_dll.prf b/mkspecs/features/win32/qt_dll.prf deleted file mode 100644 index f03c0c08c1..0000000000 --- a/mkspecs/features/win32/qt_dll.prf +++ /dev/null @@ -1 +0,0 @@ -CONFIG *= qt diff --git a/mkspecs/features/win32/separate_debug_info.prf b/mkspecs/features/win32/separate_debug_info.prf index 2838020f01..8550fdda15 100644 --- a/mkspecs/features/win32/separate_debug_info.prf +++ b/mkspecs/features/win32/separate_debug_info.prf @@ -13,6 +13,10 @@ have_target:!static:!isEmpty(QMAKE_OBJCOPY) { QMAKE_POST_LINK = $$copy_debug_info && $$strip_debug_info && $$link_debug_info $$QMAKE_POST_LINK silent:QMAKE_POST_LINK = @echo creating $@.debug && $$QMAKE_POST_LINK - target.targets += $$QMAKE_TARGET_DEBUG_INFO + contains(TEMPLATE, lib$):!plugin { + dlltarget.targets += $$QMAKE_TARGET_DEBUG_INFO + } else { + target.targets += $$QMAKE_TARGET_DEBUG_INFO + } QMAKE_DISTCLEAN += $$QMAKE_TARGET_DEBUG_INFO } diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index 272170d428..66ef21f2de 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -2,15 +2,4 @@ CONFIG -= console QMAKE_LFLAGS += $$QMAKE_LFLAGS_WINDOWS contains(TEMPLATE, ".*app") { QMAKE_LFLAGS += $$QMAKE_LFLAGS_EXE - mingw:DEFINES += QT_NEEDS_QMAIN - - qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { - isEqual(entryLib, -lqtmain) { - lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB - PRE_TARGETDEPS += $$lib - QMAKE_LIBS += $$lib - } else { - QMAKE_LIBS += $${entryLib} - } - } } |