diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 08:27:03 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 08:27:53 +0100 |
| commit | ea5f40a7880946dd5e3346235d1a8e1a1a8fd42e (patch) | |
| tree | 3aadba9965f8a77e2ce4169233b524f091a0e176 /mkspecs | |
| parent | bdf49888ef4044bd513bfd4c888071b41119a6d4 (diff) | |
| parent | b13801fd550d4eef2e45ac3e11304571e0146dd9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ib43c6f126998eefcfed9a7c1f2bcbac8b4dd05ec
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qml_plugin.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 18 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/xcodebuild.mk | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index a639ac2969..1bc05caefe 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -19,6 +19,8 @@ if(win32|mac):!macx-xcode { contains(QT_CONFIG, build_all):CONFIG += build_all } +CONFIG += relative_qt_rpath # Qt's QML plugins should be relocatable + !no_cxx_module:isEmpty(CXX_MODULE) { CXX_MODULE = $$TARGET TARGET = declarative_$${TARGET} diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 403b847ac1..00f4bdf93e 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -120,15 +120,9 @@ defineTest(qtAddTargetEnv) { deps = $$replace($$2, -private$, _private) deps = $$resolve_depends(deps, "QT.", ".depends" ".run_depends") !isEmpty(deps) { - ptypes = - for(dep, deps) { - isEmpty(3): \ - deppath += $$shell_path($$eval(QT.$${dep}.libs)) - else: \ - deppath += $$system_path($$eval(QT.$${dep}.libs)) - ptypes += $$eval(QT.$${dep}.plugin_types) - } + libs = libs equals(QMAKE_HOST.os, Windows) { + libs = bins deppath.name = PATH } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) { deppath.name = LD_LIBRARY_PATH @@ -144,6 +138,14 @@ defineTest(qtAddTargetEnv) { } else { error("Operating system not supported.") } + ptypes = + for(dep, deps) { + isEmpty(3): \ + deppath += $$shell_path($$eval(QT.$${dep}.$$libs)) + else: \ + deppath += $$system_path($$eval(QT.$${dep}.$$libs)) + ptypes += $$eval(QT.$${dep}.plugin_types) + } deppath.value = $$unique(deppath) deppath.CONFIG = prepend diff --git a/mkspecs/macx-ios-clang/xcodebuild.mk b/mkspecs/macx-ios-clang/xcodebuild.mk index afe331240b..1bd18430df 100644 --- a/mkspecs/macx-ios-clang/xcodebuild.mk +++ b/mkspecs/macx-ios-clang/xcodebuild.mk @@ -40,6 +40,10 @@ $(EXPORT_SUBTARGETS): % : %-build %-install: ACTION = install %-install: xcodebuild-% ; +# iOS Simulator doesn't support archiving +%-iphonesimulator-install: ACTION = build +iphonesimulator-install: ACTION = build + # Limit check to a single configuration %-iphoneos-check: check-iphoneos ; %-iphonesimulator-check: check-iphonesimulator ; |