diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-28 01:00:17 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-10-28 10:50:03 +0100 |
| commit | 08f90adffdde1d7a4efa0de66f69091bd52d1d4b (patch) | |
| tree | b606ee7896d4550cd3e8150a5cc6db6a03f6bd39 /configure.pri | |
| parent | dcbe25bbbb603bc335d7cf0982a80293289b0d8f (diff) | |
| parent | a21d4395f4f9afea52b6c2da359ce6ad21ebc763 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/corelib/serialization/qjson_p.h
Change-Id: I83cea141a4de8b3998478bfded84ca9029f7a2a9
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri index 5f82efbf07..97b9f3bf63 100644 --- a/configure.pri +++ b/configure.pri @@ -734,7 +734,13 @@ defineTest(qtConfOutput_preparePaths) { } have_prefix = false } else { - config.input.prefix = $$absolute_path($$config.input.prefix, $$OUT_PWD) + equals(XSPEC, $$[QMAKE_SPEC]) { + # Only make the user-specified prefix absolute if we're not cross-compiling. + config.input.prefix = $$absolute_path($$config.input.prefix, $$OUT_PWD) + } else { + # But we still must normalize path separators. + config.input.prefix = $$replace(config.input.prefix, \\\\, /) + } have_prefix = true } |