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 /src/activeqt | |
| 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 'src/activeqt')
| -rw-r--r-- | src/activeqt/container/container.pro | 2 | ||||
| -rw-r--r-- | src/activeqt/control/control.pro | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro index d654f92..4c9b3a8 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 \ diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index 44eb928..361ca29 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -18,11 +18,11 @@ CONFIG += qt warn_off staticlib QTDIR_build:DESTDIR = $$QT_BUILD_TREE\\lib DEFINES += QAX_SERVER -win32-g++:DEFINES += QT_NEEDS_QMAIN +win32-g++*:DEFINES += QT_NEEDS_QMAIN win32-borland:DEFINES += QT_NEEDS_QMAIN LIBS += -luser32 -lole32 -loleaut32 -lgdi32 -win32-g++:LIBS += -luuid +win32-g++*:LIBS += -luuid HEADERS = qaxaggregated.h \ qaxbindable.h \ |