diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-04 10:41:19 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-04 13:41:04 +0200 |
| commit | bc5f45052fd8f9a5481a37a6a4d55c7f6cbf037d (patch) | |
| tree | 2c20e6c42ccd008e431a8d485450713883eacbb5 /mkspecs/features/toolchain.prf | |
| parent | b8947e9194f0f88f464448ac51f6a05113d36a33 (diff) | |
| parent | 3faf8f4d48abd982be8470786cc5f61372519722 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/corelib/global/qglobal.h
src/corelib/tools/qcryptographichash.cpp
src/corelib/tools/qcryptographichash.h
src/corelib/tools/qmessageauthenticationcode.cpp
src/plugins/platforms/windows/qwindowswindow.h
tests/auto/gui/kernel/qwindow/BLACKLIST
tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST
Change-Id: Ib68112de985a3d714c2071f47c10e907e4f0229a
Diffstat (limited to 'mkspecs/features/toolchain.prf')
| -rw-r--r-- | mkspecs/features/toolchain.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index 35175f1744..7b6f48de72 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -120,7 +120,7 @@ isEmpty($${target_prefix}.INCDIRS) { } } } - !darwin:clang { + if(!darwin:clang)|intel_icc { # Clang on a non-Apple system (that is, a system without ld64 -- say, with GNU ld # or gold under Linux) will not print any library search path. Need to use another # invocation with different options (which in turn doesn't print include search @@ -205,7 +205,7 @@ isEmpty($${target_prefix}.COMPILER_MACROS) { vars = $$qtVariablesFromGCC($$QMAKE_CXX) } for (v, vars) { - isEmpty(v)|contains(v, $${LITERAL_HASH}.*): next() + contains(v, $${LITERAL_HASH}.*)|contains(v, " *"): next() # Set both <varname> for the outer scope ... eval($$v) v ~= s/ .*// |