diff options
| author | axis <qt-info@nokia.com> | 2011-01-31 11:37:19 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-01-31 11:37:19 (GMT) |
| commit | 5cd39cd8a70be4c22164fe060ad64a1d9108bf41 (patch) | |
| tree | 4b072c7d4e4d717fe8f0977dd2108837ac71f7c3 /mkspecs/win32-msvc2010 | |
| parent | c40ae86025856225e74289249ecc509bf61dc9ba (diff) | |
| parent | 9c132451acc7fbed1611fd3676cceb26e815f50d (diff) | |
| download | Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.zip Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.tar.gz Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Diffstat (limited to 'mkspecs/win32-msvc2010')
| -rw-r--r-- | mkspecs/win32-msvc2010/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2010/qplatformdefs.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index c08a74d..1cad99e 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/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 \"/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 diff --git a/mkspecs/win32-msvc2010/qplatformdefs.h b/mkspecs/win32-msvc2010/qplatformdefs.h index 68f9ee0..9cf90f5 100644 --- a/mkspecs/win32-msvc2010/qplatformdefs.h +++ b/mkspecs/win32-msvc2010/qplatformdefs.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |