diff options
author | Mark Brand <mabrand@mabrand.nl> | 2010-06-10 12:35:03 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-10 12:35:03 (GMT) |
commit | 0d5649713af91dcce58a623bbef7d38e2fbdf13b (patch) | |
tree | 4790deef3f2d8a810f3e98751c3cd119fde8c993 /tools/assistant | |
parent | 1fc149fdc32e12043c9c2676e2a381e225886dbf (diff) | |
download | Qt-0d5649713af91dcce58a623bbef7d38e2fbdf13b.zip Qt-0d5649713af91dcce58a623bbef7d38e2fbdf13b.tar.gz Qt-0d5649713af91dcce58a623bbef7d38e2fbdf13b.tar.bz2 |
use "win32-g++*" scope to match all MinGW makespecs
The scope "win32-g++" comes from the name of the makespec. However, it
is frequently used to check for MinGW. This works fine as long as
win32-g++ is the only makespec for MinGW. Now we need the wildcard
to cover "win32-g++-cross" as well.
Also reordered test of win32 before win32-g++*.
Also took opportunity to use else.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/assistant')
-rw-r--r-- | tools/assistant/lib/fulltextsearch/fulltextsearch.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro index fb1a0dd..4d2fddb 100644 --- a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro +++ b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro @@ -29,7 +29,7 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore CONFIG(exceptions_off) { CONFIG -= exceptions_off CONFIG += exceptions - !win32|win32-g++ { + !win32|win32-g++* { QMAKE_CFLAGS -= -fno-exceptions QMAKE_CXXFLAGS -= -fno-exceptions QMAKE_LFLAGS -= -fno-exceptions |