From ec4c2e640dbcb35769ae3fb0699e42f07b3009db Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Tue, 7 Mar 2017 14:51:20 +0100
Subject: Fix cache file generation for prefix and shadow builds

For prefix builds generate the cache files in $$MODULE_BASE_OUTDIR/qml/
and install them from there.

The use of relative paths for the qml cache extra compiler output is
required because target_predeps in the extra compiler configuration will
generate relative paths as dependency for the target.

Task-number: QTBUG-58570
Change-Id: I6eedfd2aca1b0bdc7a230ce7521e499c6ab70ee0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 tools/qmlcachegen/qmlcache.prf | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'tools/qmlcachegen')

diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
index 5cac5592c3..31c18a231b 100644
--- a/tools/qmlcachegen/qmlcache.prf
+++ b/tools/qmlcachegen/qmlcache.prf
@@ -17,22 +17,36 @@ QML_CACHEGEN_ARGS=--target-architecture=$$QML_CACHEGEN_ARCH
     return()
 }
 
+load(qt_build_paths)
+
+prefix_build: QMLCACHE_DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
+else: QMLCACHE_DESTDIR = $$[QT_INSTALL_QML]/$$TARGETPATH
+
 CACHEGEN_FILES=
+qmlcacheinst.files =
 for(qmlf, QML_FILES) {
     contains(qmlf,.*\\.js$)|contains(qmlf,.*\\.qml$) {
-        CACHEGEN_FILES += $$qmlf
+        CACHEGEN_FILES += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_)
+        qmlcacheinst.files += $$QMLCACHE_DESTDIR/$$relative_path($$qmlf, $$_PRO_FILE_PWD_)c
     }
 }
 
-qmlcachegen.input = CACHEGEN_FILES
-prefix_build {
-    qmlcachegen.output = ${QMAKE_FILE_IN}c
-} else {
-    qmlcachegen.output = $$[QT_INSTALL_QML]/$$TARGETPATH/${QMAKE_FILE_IN}c
-    qmlcachegen.CONFIG = no_link target_predeps
+defineReplace(qmlCacheOutputFileName) {
+    return($$relative_path($$QMLCACHE_DESTDIR/$$relative_path($$1, $$_PRO_FILE_PWD_)c, $$OUT_PWD))
 }
+
+qmlcacheinst.base = $$QMLCACHE_DESTDIR
+qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH
+qmlcacheinst.CONFIG = no_check_exist
+
+qmlcachegen.input = CACHEGEN_FILES
+qmlcachegen.output = ${QMAKE_FUNC_FILE_IN_qmlCacheOutputFileName}
+qmlcachegen.CONFIG = no_link target_predeps
 qmlcachegen.commands = $$QML_CACHEGEN $$QML_CACHEGEN_ARGS -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
 qmlcachegen.name = Generate QML Cache ${QMAKE_FILE_IN}
 qmlcachegen.variable_out = GENERATED_FILES
 
-QMAKE_EXTRA_COMPILERS += qmlcachegen
+!debug_and_release|!build_all|CONFIG(release, debug|release) {
+    QMAKE_EXTRA_COMPILERS += qmlcachegen
+    INSTALLS += qmlcacheinst
+}
-- 
cgit v1.2.3