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/win32-msvc2008 | |
| 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/win32-msvc2008')
| -rw-r--r-- | mkspecs/win32-msvc2008/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf index 9f9c919..c765562 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/qmake.conf @@ -55,12 +55,13 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = link -QMAKE_LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\" +QMAKE_LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS +QMAKE_LFLAGS_EXE = \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\" QMAKE_LFLAGS_DLL = /DLL QMAKE_LFLAGS_LTCG = /LTCG |