From 0d5649713af91dcce58a623bbef7d38e2fbdf13b Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 10 Jun 2010 14:35:03 +0200 Subject: 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 --- src/winmain/winmain.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/winmain') diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index bc322b9a33..efee3cde91 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -8,7 +8,7 @@ CONFIG += staticlib warn_on CONFIG -= qt shared win32 { - win32-g++:DEFINES += QT_NEEDS_QMAIN + win32-g++*:DEFINES += QT_NEEDS_QMAIN win32-borland:DEFINES += QT_NEEDS_QMAIN SOURCES = qtmain_win.cpp CONFIG += png zlib -- cgit v1.2.3