summaryrefslogtreecommitdiff
path: root/src/activeqt/container
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-06-10 14:35:03 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-10 14:35:03 +0200
commit0d5649713af91dcce58a623bbef7d38e2fbdf13b (patch)
tree4790deef3f2d8a810f3e98751c3cd119fde8c993 /src/activeqt/container
parent1fc149fdc32e12043c9c2676e2a381e225886dbf (diff)
downloadqt4-tools-0d5649713af91dcce58a623bbef7d38e2fbdf13b.tar.gz
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 'src/activeqt/container')
-rw-r--r--src/activeqt/container/container.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro
index d654f927fe..4c9b3a8b4d 100644
--- a/src/activeqt/container/container.pro
+++ b/src/activeqt/container/container.pro
@@ -19,7 +19,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/lib
LIBS += -lole32 -loleaut32
!wince*:LIBS += -luser32 -lgdi32 -ladvapi32
-win32-g++:LIBS += -luuid
+win32-g++*:LIBS += -luuid
HEADERS = ../control/qaxaggregated.h \
qaxbase.h \