diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-05-18 08:52:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-05-18 08:52:33 +0200 |
| commit | 2cd6d76d680b1bddef774acc51d80da9e29f1c2e (patch) | |
| tree | 69f2aac58f25223910debd0f20b9d5550c69541c /mkspecs | |
| parent | b800f3039a754f67466df5e195e70ea2821f9404 (diff) | |
| parent | 786ae0141a524c66e01e652aed0e6ed4c97d08bc (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/text/qbytearray.cpp
Change-Id: I63706409464d31391012bacdadfd1f6300509787
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/cmake_functions.prf | 9 | ||||
| -rw-r--r-- | mkspecs/features/qt.prf | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mkspecs/features/cmake_functions.prf b/mkspecs/features/cmake_functions.prf index 1e6b05c78e..0c62b46af3 100644 --- a/mkspecs/features/cmake_functions.prf +++ b/mkspecs/features/cmake_functions.prf @@ -42,10 +42,17 @@ defineReplace(cmakeTargetPaths) { } defineReplace(cmakePortablePaths) { + SYSR = $$[QT_SYSROOT] + !isEmpty(SYSR): SYSR = ${CMAKE_SYSROOT} variable = $$1 out = for(v, variable) { - out += $$[QT_SYSROOT]$$cmakeTargetPath($$v) + path = $$cmakeTargetPath($$v) + contains(path, /.*): \ + sysroot_prefix = $$SYSR + else: \ + sysroot_prefix = $$SYSR/ + out += $${sysroot_prefix}$${path} } return ($$join(out, ";")) } diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 6fe0059bf7..99b7fe6562 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -293,7 +293,7 @@ contains(all_qt_module_deps, qml): \ !isEmpty(SCANNERRESOURCES) { IMPORTPATHS += -qrcFiles - for (RESOURCE, SCANNERRESOURCES) + for (RESOURCE, SCANNERRESOURCES): \ IMPORTPATHS += $$absolute_path($$system_quote($$RESOURCE), $$_PRO_FILE_PWD_) } |