From ba3b53cb501a77144aa6259e48a8e0edc3d1481d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Mon, 11 May 2020 10:15:08 +0200
Subject: Fix scanned resources in static builds

Fixes: QTBUG-81621
Change-Id: Ica23e99054c7b2498bdb1e256c256c8b430938b4
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 mkspecs/features/qt.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs/features')

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_)
     }
 
-- 
cgit v1.2.3


From 786ae0141a524c66e01e652aed0e6ed4c97d08bc Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 30 Apr 2020 06:13:03 +0200
Subject: CMake: Don't hard-code the sysroot in Qt5XXXConfigExtras.cmake

Instead of writing the hard-coded sysroot into the .cmake file, write
the variable ${CMAKE_SYSROOT}. This makes it possible to relocate the
build to a machine where the sysroot is different from the build
machine.

Fixes: QTBUG-83335
Change-Id: Iaa69feb9a140b050f6b5547929cc940ee0f039ce
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 mkspecs/features/cmake_functions.prf | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'mkspecs/features')

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, ";"))
 }
-- 
cgit v1.2.3