diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-21 08:59:26 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-21 08:59:26 +0100 |
commit | cc920b4cddc170a7442d8fdfb53076c208a3d71e (patch) | |
tree | e4757cffe420bd3c61dda1d369b452a0fac9eff7 /mkspecs/features/resources.prf | |
parent | c8c8cc790a315710b0dae2282dc32e3472e107ee (diff) | |
parent | fc8fd508165c8e4dcfe0da397b63cf99f15178e3 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I35a6555e3885e489f88aa9b4b0142e1017f7a959
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() } |