summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-msvc2008/qmake.conf
diff options
context:
space:
mode:
authorminiak <milan.burda@gmail.com>2011-01-07 18:16:33 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-01-07 18:16:33 (GMT)
commit6e3ae781a7bd3b5ae2143ef60f969d89663508e3 (patch)
tree429c617d53b3eb0f76928a374eb0ccb8ae0a2b75 /mkspecs/win32-msvc2008/qmake.conf
parent1638129ccbe9680a41859dc48d063a63ae103b1a (diff)
downloadQt-6e3ae781a7bd3b5ae2143ef60f969d89663508e3.zip
Qt-6e3ae781a7bd3b5ae2143ef60f969d89663508e3.tar.gz
Qt-6e3ae781a7bd3b5ae2143ef60f969d89663508e3.tar.bz2
Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
Native Win32 C++ projects created in Visual Studio have this enabled in the default configuration in order to increase security. Merge-request: 2539 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/win32-msvc2008/qmake.conf')
-rw-r--r--mkspecs/win32-msvc2008/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 24a0486..9f9c919 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -55,7 +55,7 @@ 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 \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO
QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
QMAKE_LFLAGS_DEBUG = /DEBUG