diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:48:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:48:10 +0100 |
| commit | 739585b2f5684956d9c5b999300b4b7b2cd0daa3 (patch) | |
| tree | c785232d461328db1a2a8e85748e75e402ed8a08 /mkspecs/features | |
| parent | 0ffc39806e4669eaebe2d20d197b3a6f356be862 (diff) | |
| parent | 13f6eb9773c0a4c64da7070be4ac3bbf66f8c82d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/corelib/io/qprocess_win.cpp
Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_example_installs.prf | 18 | ||||
| -rw-r--r-- | mkspecs/features/testcase.prf | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf index 668669e4cd..c9ce926b1a 100644 --- 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 += \ diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 3e1537dde0..8d51c9d028 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -44,7 +44,7 @@ unix { $${type}.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET) } else { # Windows - !isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = $${TEST_TARGET_DIR}$${QMAKE_DIR_SEP} + !isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = $$shell_path($$TEST_TARGET_DIR)$${QMAKE_DIR_SEP} $${type}.commands += $${TEST_TARGET_DIR}$(TARGET) } |