diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:01:01 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:01:02 +0100 |
| commit | 4b0af2cdbf61572b22ea6b8aa17fc9f52c71ac4b (patch) | |
| tree | 60fb25a6772f5ac2d26af005b9888ff09c08a6c1 /configure.pri | |
| parent | cff492fed1d98f45c4c1f4011f1451120c0d1c23 (diff) | |
| parent | 36e277e91732d6d75fb6d9cb691fe9c0f83f6178 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I68a6ed3184e62fa89c47c564bb01002c0918d0fd
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 35cc08d694..f0fa5c1516 100644 --- a/configure.pri +++ b/configure.pri @@ -733,7 +733,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 } |