diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-03-15 16:54:25 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-03-20 07:34:50 +0000 |
| commit | 0ffb7c419a6d00fa8db00c811968d45ba5193856 (patch) | |
| tree | c8ee97ff89026c0a605cddd5e38707ca26cf7d33 /mkspecs/features/resources.prf | |
| parent | 1cb439dc948d6e610da49331184f0a660ef57b4e (diff) | |
Fix CONFIG+=qtquickcompiler and immediate resources with shadow builds
Generated files should be added to RESOURCES with an absolute path.
Task-number: QTBUG-67011
Change-Id: Ief82b576824df9abd0901970f076e30dfe57b7d0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/features/resources.prf')
| -rw-r--r-- | mkspecs/features/resources.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index 3f5979202c..ff45446219 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -33,7 +33,7 @@ for(resource, RESOURCES) { next() } - resource_file = $$RCC_DIR/qmake_$${resource}.qrc + resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) isEmpty(BUILDS)|build_pass { # Collection of files, generate qrc file @@ -64,7 +64,7 @@ for(resource, RESOURCES) { "</qresource>" \ "</RCC>" - !write_file($$absolute_path($$resource_file, $$OUT_PWD), resource_file_content): \ + !write_file($$resource_file, resource_file_content): \ error() } |