diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-05-31 16:55:13 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2019-05-31 15:34:17 +0000 |
| commit | d60be1f303a483f3a409b4a0fd2fd7d09e1f39a5 (patch) | |
| tree | 0e2a0a460025bc12d00a7b50fdd8df42646657fe /qmake-features | |
| parent | defafd6aaa5559f4ae743e6460c64b1ac0db7b74 (diff) | |
[build-system] EXTRA_FILES always need to be absolute paths
Don't try to be smart when iterating over EXTRA_FILES and detect
where it is located. All files in EXTRA_FILES need to be absolute
paths now.
Change-Id: I0b490a253ac0f947d87f9ae0fe304b0b0681c941
Fixes: AUTOSUITE-998
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'qmake-features')
| -rw-r--r-- | qmake-features/qmlplugin.prf | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/qmake-features/qmlplugin.prf b/qmake-features/qmlplugin.prf index ea8b8ad6..e1a6a0d6 100644 --- a/qmake-features/qmlplugin.prf +++ b/qmake-features/qmlplugin.prf @@ -14,12 +14,7 @@ exists($$_PRO_FILE_PWD_/qmldir) { # Always copy all EXTRA_FILES to the plugin destination for(extra_file, EXTRA_FILES) { - exists($$extra_file) { - file = $$extra_file - } else { - file = $$_PRO_FILE_PWD_/$${extra_file} - } - file = $$replace(file, /, $$QMAKE_DIR_SEP) + file = $$replace(extra_file, /, $$QMAKE_DIR_SEP) target = $$replace(DESTDIR, /, $$QMAKE_DIR_SEP)$${QMAKE_DIR_SEP}$$basename(file) copy_$${extra_file}.target = $$target copy_$${extra_file}.depends = $$file |