diff options
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/qt_common.prf | 1 | ||||
-rw-r--r-- | mkspecs/features/qt_plugin.prf | 17 | ||||
-rw-r--r-- | mkspecs/features/testcase.prf | 22 | ||||
-rw-r--r-- | mkspecs/features/unix/separate_debug_info.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 33 |
5 files changed, 56 insertions, 19 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 051420e4f1..6cd848b405 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -19,7 +19,6 @@ contains(TEMPLATE, .*lib) { unix:contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions contains(QT_CONFIG, largefile): CONFIG += largefile contains(QT_CONFIG, separate_debug_info): CONFIG += separate_debug_info - contains(QT_CONFIG, separate_debug_info_nocopy): CONFIG += separate_debug_info_nocopy } warnings_are_errors:warning_clean { diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index f710bbff43..ba12b9c1cd 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -55,12 +55,11 @@ load(qt_common) wince*:LIBS += $$QMAKE_LIBS_GUI QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF -unix|mingw { - !isEmpty(_QMAKE_SUPER_CACHE_): \ - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR - lib_replace.match = $$rplbase/lib - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] - QMAKE_PRL_INSTALL_REPLACE += lib_replace -} +!isEmpty(_QMAKE_SUPER_CACHE_): \ + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* +else: \ + rplbase = $$MODULE_BASE_OUTDIR +lib_replace.match = $$rplbase/lib +lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +lib_replace.CONFIG = path +QMAKE_PRL_INSTALL_REPLACE += lib_replace diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 10f421a8e2..40ec7cff30 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -134,6 +134,28 @@ contains(INSTALLS, target) { INSTALLS += $$tdi } + # Install GENERATED_TESTDATA. + # Logic is copied from the TESTDATA installation, only difference being that + # INSTALL target is added with CONFIG = no_check_exist + for(file, GENERATED_TESTDATA) { + tnam = $$file + tnam ~= s,\\.\\.,dotdot, + tnam ~= s,[?*],wildcard, + tnam ~= s,[^A-Za-z0-9],_, + tdi = testdata_$$tnam + tdif = $${tdi}.files + tdip = $${tdi}.path + tdic = $${tdi}.CONFIG + + $$tdif = $$file + $$tdic = no_check_exist + + file = $$replace(file, ^(\\.\\./)+, ) + $$tdip = $${target.path}/$$dirname(file) + + INSTALLS += $$tdi + } + # TEST_HELPER_INSTALLS specifies additional test helper executables for installation. # # Typical usage is: diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf index c5ff6dcba3..394d5f42bc 100644 --- a/mkspecs/features/unix/separate_debug_info.prf +++ b/mkspecs/features/unix/separate_debug_info.prf @@ -1,5 +1,5 @@ -!separate_debug_info_nocopy:have_target:!static:!isEmpty(QMAKE_OBJCOPY) { +have_target:!static:!isEmpty(QMAKE_OBJCOPY) { qnx { debug_info_suffix = sym debug_info_keep = --keep-file-symbols diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 969a6780ce..a959bc5480 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -39,8 +39,13 @@ manifest_file.input = $$WINRT_MANIFEST - load(resolve_target) - BUILD_DIR = $$dirname(QMAKE_RESOLVED_TARGET) + contains(TEMPLATE, "vc.*") { + BUILD_DIR = $$OUT_PWD + } else { + load(resolve_target) + BUILD_DIR = $$dirname(QMAKE_RESOLVED_TARGET) + } + winphone: \ manifest_file.output = $$BUILD_DIR/WMAppManifest.xml else: contains(TEMPLATE, "vc.*"): \ @@ -87,16 +92,28 @@ winphone: INDENT = "$$escape_expand(\\r\\n) " else: INDENT = "$$escape_expand(\\r\\n) " + # Capabilities are given as a string list and may change with the configuration (network, sensors, etc.) WINRT_MANIFEST.capabilities = $$unique(WINRT_MANIFEST.capabilities) - for(CAPABILITY, WINRT_MANIFEST.capabilities): \ - MANIFEST_CAPABILITIES += " <Capability Name=\"$$CAPABILITY\" />" - WINRT_MANIFEST.capabilities = $$join(MANIFEST_CAPABILITIES, $$INDENT, $$INDENT, $$INDENT) + !isEmpty(WINRT_MANIFEST.capabilities)|winphone { + MANIFEST_CAPABILITIES += "<Capabilities>" + for(CAPABILITY, WINRT_MANIFEST.capabilities): \ + MANIFEST_CAPABILITIES += " <Capability Name=\"$$CAPABILITY\" />" + MANIFEST_CAPABILITIES += "</Capabilities>" + + WINRT_MANIFEST.capabilities = $$join(MANIFEST_CAPABILITIES, $$INDENT, $$INDENT) + } + # Dependencies are given as a string list. The CRT dependency is added automatically above. WINRT_MANIFEST.dependencies = $$unique(WINRT_MANIFEST.dependencies) - for(DEPENDENCY, WINRT_MANIFEST.dependencies): \ - MANIFEST_DEPENDENCIES += " <PackageDependency Name=\"$$DEPENDENCY\" />" - WINRT_MANIFEST.dependencies = $$join(MANIFEST_DEPENDENCIES, $$INDENT, $$INDENT, $$INDENT) + !isEmpty(WINRT_MANIFEST.dependencies) { + MANIFEST_DEPENDENCIES += "<Dependencies>" + for(DEPENDENCY, WINRT_MANIFEST.dependencies): \ + MANIFEST_DEPENDENCIES += " <PackageDependency Name=\"$$DEPENDENCY\" />" + MANIFEST_DEPENDENCIES += "</Dependencies>" + + WINRT_MANIFEST.dependencies = $$join(MANIFEST_DEPENDENCIES, $$INDENT, $$INDENT) + } # Provide default icons where needed isEmpty(WINRT_ASSETS_PATH): WINRT_ASSETS_PATH = $$[QT_HOST_DATA/get]/mkspecs/common/winrt_winphone/assets |