diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-27 01:00:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-27 01:00:11 +0200 |
| commit | 03f7d0a005eca7c796c8721a8bec860e320f4219 (patch) | |
| tree | 255b5b6a8d09e973fd52ae48b1373f95a6ebfda2 /mkspecs | |
| parent | c530ca1c170798159c3d84029841a1224d1cdc65 (diff) | |
| parent | d6e65ecac5852ed09fbf580b3fab5b21125dfd69 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I1c9449ab064deed1367a7e5dbedfcb489f28140e
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/toolchain.prf | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index 9c3a64aa8b..03612e5689 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -267,9 +267,13 @@ isEmpty($${target_prefix}.INCDIRS) { for (line, output) { contains(line, "^libraries: .*") { line ~= s,^libraries: ,, - # clang (7.x) on Windows uses the wrong path list separator ... - equals(QMAKE_HOST.os, Windows): line ~= s,:(?![/\\\\]),;, - paths = $$split(line, $$QMAKE_DIRLIST_SEP) + equals(QMAKE_HOST.os, Windows) { + # clang (7.x) on Windows uses the wrong path list separator ... + line ~= s,:(?![/\\\\]),;, + paths = $$split(line, ;) + } else { + paths = $$split(line, $$QMAKE_DIRLIST_SEP) + } for (path, paths): \ QMAKE_DEFAULT_LIBDIRS += $$clean_path($$replace(path, ^=, $$[SYSROOT])) } |