diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-12 18:01:29 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-02-12 18:13:34 +0000 |
| commit | 93bcd488af0407f9808e4f977102f85c1a59a095 (patch) | |
| tree | cb4a79fa9500f3210d7ec58df05b037c7e62d4eb /mkspecs | |
| parent | 0e82e1bd237fe295e0e30ec3613afd95142f3941 (diff) | |
| parent | d3b3be6865b78479da6c7e822b80064a6ea08554 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/toolchain.prf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index 2a7cbabc54..9c3a64aa8b 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -229,7 +229,10 @@ isEmpty($${target_prefix}.INCDIRS) { line ~= s/^[ \\t]*// # remove leading spaces contains(line, "LIBRARY_PATH=.*") { line ~= s/^LIBRARY_PATH=// # remove leading LIBRARY_PATH= - paths = $$split(line, $$QMAKE_DIRLIST_SEP) + equals(QMAKE_HOST.os, Windows): \ + paths = $$split(line, ;) + else: \ + paths = $$split(line, $$QMAKE_DIRLIST_SEP) for (path, paths): \ QMAKE_DEFAULT_LIBDIRS += $$clean_path($$path) } else: contains(line, "Library search paths:") { |