From d941ebc1505cc45c7d6f8e1b2abdd2e2d9c3afae Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 4 Dec 2018 13:33:10 +0100 Subject: qmake: fix QMAKE_DEFAULT_LIBDIRS detection for android on windows clearly, nobody told clang that on windows you're supposed to use semicolons instead of colons to separate elements of a path list ... Fixes: QTBUG-72268 Change-Id: Ia7adc8de3bca586d4c15b069cb04e4cb647ae823 Reviewed-by: Liang Qi Reviewed-by: Joerg Bornemann --- mkspecs/features/toolchain.prf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs/features/toolchain.prf') diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index 6039c52bd0..55295f271f 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -134,6 +134,8 @@ 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) for (path, paths): \ QMAKE_DEFAULT_LIBDIRS += $$clean_path($$replace(path, ^=, $$[SYSROOT])) -- cgit v1.2.3