diff options
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/android/android.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/create_cmake.prf | 13 | ||||
-rw-r--r-- | mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 13 | ||||
-rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/qt_installs.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/wayland-scanner.prf | 2 |
6 files changed, 23 insertions, 11 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 9e86110da6..f428f7db87 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -1,7 +1,7 @@ contains(TEMPLATE, ".*app") { !android_app { !contains(TARGET, ".so"): TARGET = lib$${TARGET}.so - QMAKE_LFLAGS += -Wl,-soname,$$TARGET + QMAKE_LFLAGS += -Wl,-soname,$$shell_quote($$TARGET) android_install: { target.path=/libs/$$ANDROID_TARGET_ARCH/ diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index aee3e79765..2533b7b8d6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -166,8 +166,6 @@ contains(CONFIG, plugin) { return() } -contains($$list(network sql widgets gui), $$MODULE): CMAKE_LOAD_PLUGINS = true - unix:contains(QT_CONFIG, reduce_relocations):CMAKE_ADD_FPIE_FLAGS = "true" CMAKE_MKSPEC = $$[QMAKE_XSPEC] @@ -293,3 +291,14 @@ exists($$cmake_macros_file.input) { } cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} + +# We are generating cmake files. Most developers of Qt are not aware of cmake, +# so we require automatic tests to be available. The only module which should +# set CMAKE_MODULE_TESTS to '-' is enginio because that is known to be broken. +# Other modules should either create proper tests in tests/auto/cmake or, as +# a temporary measure, disable the generation of cmake files +# with 'CONFIG -= create_cmake' +!equals(CMAKE_MODULE_TESTS, -) { + isEmpty(CMAKE_MODULE_TESTS): CMAKE_MODULE_TESTS = $$MODULE_BASE_INDIR/tests/auto/cmake + !exists($$CMAKE_MODULE_TESTS): error("Missing CMake tests.") +} diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index dce981e059..d1dfeed535 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -283,7 +283,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE -!!IF !isEmpty(CMAKE_LOAD_PLUGINS) + file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -299,11 +299,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endmacro() - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - foreach(pluginTarget ${pluginTargets}) - include(${pluginTarget}) - endforeach() -!!ENDIF + if (pluginTargets) + foreach(pluginTarget ${pluginTargets}) + include(${pluginTarget}) + endforeach() + endif() + !!IF !isEmpty(CMAKE_MODULE_EXTRAS) include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index f8ba3c58b2..9edf5cd530 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -128,7 +128,7 @@ contains(qt_module_deps, qml): \ QML_IMPORT_CPP = $$OUT_PWD/$$lower($$basename(TARGET))_qml_plugin_import.cpp write_file($$QML_IMPORT_CPP, IMPORT_FILE_CONT)|error("Aborting.") SOURCES += $$QML_IMPORT_CPP - QMAKE_CLEAN += $$QML_IMPORT_CPP + QMAKE_DISTCLEAN += $$QML_IMPORT_CPP # copy qml files. this part is platform spesific. mac { diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf index 7d2280e75a..3a5dbb6274 100644 --- a/mkspecs/features/qt_installs.prf +++ b/mkspecs/features/qt_installs.prf @@ -22,7 +22,7 @@ target.path = $$[QT_HOST_LIBS] else: \ target.path = $$[QT_INSTALL_LIBS] - target.CONFIG = no_dll + !static: target.CONFIG = no_dll INSTALLS += target } diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf index 3a9d8cafbd..5a97d98373 100644 --- a/mkspecs/features/wayland-scanner.prf +++ b/mkspecs/features/wayland-scanner.prf @@ -32,6 +32,7 @@ qt_install_headers { !isEmpty(header_files_client) { wayland_generated_client_headers.files = $$header_files_client wayland_generated_client_headers.path = $$private_headers.path + wayland_generated_client_headers.CONFIG = no_check_exist INSTALLS += wayland_generated_client_headers WAYLAND_CLIENT_HEADER_DEST = $$header_dest/ WAYLAND_CLIENT_INCLUDE_DIR = $$MODULE_INCNAME/private @@ -41,6 +42,7 @@ qt_install_headers { !isEmpty(header_files_server) { wayland_generated_server_headers.files = $$header_files_server wayland_generated_server_headers.path = $$private_headers.path + wayland_generated_server_headers.CONFIG = no_check_exist INSTALLS += wayland_generated_server_headers WAYLAND_SERVER_HEADER_DEST = $$header_dest/ WAYLAND_SERVER_INCLUDE_DIR = $$MODULE_INCNAME/private |