fix example source installation of qrc/rc files in subdirs

such a project structure violates the assumption that the referenced resources are specified relative to the sub-project root, so we must resolve them to absolute paths manually. Task-number: QTBUG-65753 Change-Id: I8bcd5c6e7d7c6a713e5fcd3668be7d2f23169501 Reviewed-by: Joerg Bornemann <[email protected]>
gantony · Jan 18, 2018 · b772d9c · b772d9c
1 parent e86f3c0
commit b772d9c
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
@@ -44,19 +44,25 @@ contains(TEMPLATE, .*app): \
 for(ex, EXAMPLE_FILES): \
     sourcefiles += $$files($$absolute_path($$ex, $$_PRO_FILE_PWD_))
 for(res, RESOURCES) {
-    rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines)
-    for(rline, rfile) {
+    !contains(res, \\.qrc$): \
+        next()
+    rfile = $$absolute_path($$res, $$_PRO_FILE_PWD_)
+    rpath = $$dirname(rfile)
+    rcont = $$cat($$rfile, lines)
+    for (rline, rcont) {
         resrc = $$replace(rline, ^[ \\t]*<file[^>]*>([^<]+)</file>[ \\t]*$, \\1)
         !equals(resrc, $$rline): \
-            sourcefiles += $$resrc
+            sourcefiles += $$absolute_path($$resrc, $$rpath)
     }
 }
 for(res, RC_FILE) {
-    rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines)
-    for(rline, rfile) {
+    rfile = $$absolute_path($$res, $$_PRO_FILE_PWD_)
+    rpath = $$dirname(rfile)
+    rcont = $$cat($$rfile, lines)
+    for (rline, rcont) {
         resrc = $$replace(rline, "^\\d+\\s+ICON\\s+[^\"]*\"([^\"]+)\"\$", \\1)
         !equals(resrc, $$rline): \
-            sourcefiles += $$resrc
+            sourcefiles += $$absolute_path($$resrc, $$rpath)
     }
 }
 sourcefiles += \