diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-22 21:00:57 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-13 19:42:43 +0100 |
commit | 8e74d136fee52af8c1cc2477618934a5e5be7cc7 (patch) | |
tree | b36ab05819e11abdc95c0f872fd84e66d02adf1f | |
parent | 172b3813078a2bf99051cdee236643fe7d35740a (diff) |
purge vestiges of QMAKE_LFLAGS_QT_DLL
Change-Id: Ia86b9cee1044ab915854e0e231e1b3d5d66e1f7d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | mkspecs/win32-icc/qmake.conf | 1 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 9777a092f8..6530003c83 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -56,7 +56,6 @@ QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:console QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:windows QMAKE_LFLAGS_DLL = /DLL -QMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000 QMAKE_LIBS = QMAKE_LIBS_CORE = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index b082fcb307..fce2147ed5 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1060,10 +1060,6 @@ void VcprojGenerator::initLinkerTool() conf.linker.OutputFile = "$(OutDir)\\"; conf.linker.OutputFile += project->first("MSVCPROJ_TARGET").toQString(); - - if(project->isActiveConfig("dll")){ - conf.linker.parseOptions(project->values("QMAKE_LFLAGS_QT_DLL")); - } } void VcprojGenerator::initResourceTool() |