diff options
| author | miniak <milan.burda@gmail.com> | 2011-01-13 14:08:01 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-24 10:42:35 (GMT) |
| commit | f3200133a385be03299c1b7ebe65c4304f65b9af (patch) | |
| tree | e39700dcac21a1cef0518b4fc17e251974fb037a /mkspecs/features/win32 | |
| parent | 972fcb6de69fb7ed3ae8147498ceb5d2ac79f057 (diff) | |
| download | Qt-f3200133a385be03299c1b7ebe65c4304f65b9af.zip Qt-f3200133a385be03299c1b7ebe65c4304f65b9af.tar.gz Qt-f3200133a385be03299c1b7ebe65c4304f65b9af.tar.bz2 | |
Add comctl32 v6 assembly dependency to applications only (not libraries)
This improves the patch from merge request #2526 to add the comctl32 v6
assembly dependency to applications only, as it was being done
previously (although only when /SUBSYSTEM:WINDOWS, not when
/SUBSYSTEM:CONSOLE). Other existing makespecs are not affected, as they
still have all flags in QMAKE_LFLAGS, and QMAKE_LFLAGS_EXE is simply
empty.
Merge-request: 1020
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/features/win32')
| -rw-r--r-- | mkspecs/features/win32/console.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/win32/windows.prf | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/features/win32/console.prf b/mkspecs/features/win32/console.prf index b34e1c6..8a1725d 100644 --- a/mkspecs/features/win32/console.prf +++ b/mkspecs/features/win32/console.prf @@ -1,2 +1,4 @@ CONFIG -= windows -contains(TEMPLATE, ".*app") : QMAKE_LFLAGS += $$QMAKE_LFLAGS_CONSOLE +contains(TEMPLATE, ".*app") { + QMAKE_LFLAGS += $$QMAKE_LFLAGS_CONSOLE $$QMAKE_LFLAGS_EXE +} diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index cf81388..f41db80 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -1,6 +1,6 @@ CONFIG -= console contains(TEMPLATE, ".*app"){ - QMAKE_LFLAGS += $$QMAKE_LFLAGS_WINDOWS + QMAKE_LFLAGS += $$QMAKE_LFLAGS_WINDOWS $$QMAKE_LFLAGS_EXE win32-g++:DEFINES += QT_NEEDS_QMAIN win32-borland:DEFINES += QT_NEEDS_QMAIN |