Change *-clang mkspec globs to *-clang*
authorBradley T. Hughes <bradley.hughes@nokia.com>
Thu, 14 Jun 2012 05:14:05 +0000 (07:14 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 20 Jun 2012 13:45:07 +0000 (15:45 +0200)
Like with the numerous g++ mkspecs, we have mkspecs with suffixes, and
these mkspecs should still match the clang globs.

Change-Id: I9296408b5192bc72cc468d229a57923e3f5ab6f0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
src/gui/gui.pro
tests/auto/tools/moc/moc.pro

index 50dc41b..ab4e555 100644 (file)
@@ -35,7 +35,7 @@ win32:!contains(QT_CONFIG, directwrite) {
     DEFINES += QT_NO_DIRECTWRITE
 }
 
-*-g++*|linux-icc*|*-clang|*-qcc* {
+*-g++*|linux-icc*|*-clang*|*-qcc* {
         sse2 {
             sse2_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS)
             sse2_compiler.commands += $$QMAKE_CFLAGS_SSE2
index 64a7c56..981f8ee 100644 (file)
@@ -19,7 +19,7 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n
            escapes-in-string-literals.h cstyle-enums.h qprivateslots.h gadgetwithnoenums.h \
            dir-in-include-path.h single_function_keyword.h task192552.h task189996.h \
            task234909.h task240368.h pure-virtual-signals.h cxx11-enums.h
-if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h
+if(*-g++*|*-icc*|*-clang*|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h
 SOURCES += tst_moc.cpp
 
 QT -= gui