From: Bradley T. Hughes Date: Thu, 14 Jun 2012 05:14:05 +0000 (+0200) Subject: Change *-clang mkspec globs to *-clang* X-Git-Tag: 071012110112~329 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf7c93b9283d6dded4fd0e57ed771d8470206093;p=profile%2Fivi%2Fqtbase.git Change *-clang mkspec globs to *-clang* 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 --- diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 50dc41b..ab4e555 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -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 diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro index 64a7c56..981f8ee 100644 --- a/tests/auto/tools/moc/moc.pro +++ b/tests/auto/tools/moc/moc.pro @@ -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