summaryrefslogtreecommitdiffstats
path: root/qmake/qmake.pri
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-06-10 12:35:03 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-10 12:35:03 (GMT)
commit0d5649713af91dcce58a623bbef7d38e2fbdf13b (patch)
tree4790deef3f2d8a810f3e98751c3cd119fde8c993 /qmake/qmake.pri
parent1fc149fdc32e12043c9c2676e2a381e225886dbf (diff)
downloadQt-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 'qmake/qmake.pri')
-rw-r--r--qmake/qmake.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 6e0f8a2..a7e0ab1 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -134,7 +134,7 @@ bootstrap { #Qt code
} else:win32 {
SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp
win32-msvc*:LIBS += ole32.lib advapi32.lib
- win32-g++:LIBS += -lole32 -luuid
+ win32-g++*:LIBS += -lole32 -luuid
}
qnx {