diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-04-28 15:48:14 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-04-29 07:35:21 (GMT) |
| commit | 1f5e2724e788e53ede53a7e9ee4e08f4ad3ccc51 (patch) | |
| tree | 2f4158cac3e167b7ce8809816fa5d0ada17150fe | |
| parent | 9b67f0b314b249b5bb7db2b9fe13f8e874f2a200 (diff) | |
| download | Qt-1f5e2724e788e53ede53a7e9ee4e08f4ad3ccc51.zip Qt-1f5e2724e788e53ede53a7e9ee4e08f4ad3ccc51.tar.gz Qt-1f5e2724e788e53ede53a7e9ee4e08f4ad3ccc51.tar.bz2 | |
qmake: fix duplicate linker options in VS project files
We don't have to evaluate QMAKE_FLAGS_CONSOLE or QMAKE_LFLAGS_WINDOWS.
These files do it for us:
mkspecs/features/win32/console.prf
mkspecs/features/win32/windows.prf
Reviewed-by: andy
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 7 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcxproj.cpp | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 6cc8272..1b4e51b 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1005,13 +1005,6 @@ void VcprojGenerator::initLinkerTool() if(project->isActiveConfig("dll")){ conf.linker.parseOptions(project->values("QMAKE_LFLAGS_QT_DLL")); } - - if(project->isActiveConfig("console")){ - conf.linker.parseOptions(project->values("QMAKE_LFLAGS_CONSOLE")); - } else { - conf.linker.parseOptions(project->values("QMAKE_LFLAGS_WINDOWS")); - } - } void VcprojGenerator::initResourceTool() diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp index 92caa31..85239fe 100644 --- a/qmake/generators/win32/msvc_vcxproj.cpp +++ b/qmake/generators/win32/msvc_vcxproj.cpp @@ -368,13 +368,6 @@ void VcxprojGenerator::initLinkerTool() if(project->isActiveConfig("dll")){ conf.linker.parseOptions(project->values("QMAKE_LFLAGS_QT_DLL")); } - - if(project->isActiveConfig("console")){ - conf.linker.parseOptions(project->values("QMAKE_LFLAGS_CONSOLE")); - } else { - conf.linker.parseOptions(project->values("QMAKE_LFLAGS_WINDOWS")); - } - } void VcxprojGenerator::initResourceTool() |