diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-18 17:20:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-18 17:20:55 (GMT) |
| commit | 8051a73be276995adfc4508a0cb5ad6451e8ab45 (patch) | |
| tree | b740f82d2ecfdfaab9726c0bdf35df80681396ba | |
| parent | 201db94dd24cf889a47fdeef89c1c5c4b94c44d2 (diff) | |
| parent | 2482191bfe660963825b404735811320a49f2b3f (diff) | |
| download | Qt-8051a73be276995adfc4508a0cb5ad6451e8ab45.zip Qt-8051a73be276995adfc4508a0cb5ad6451e8ab45.tar.gz Qt-8051a73be276995adfc4508a0cb5ad6451e8ab45.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
qmake: fix writing of incremental linker option for vcxproj files
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 0b201b8..bf84e60 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -653,7 +653,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) << valueTagT(tool.SingleProjects.at(i).Configuration.linker.IgnoreImportLibrary); } - if ( tool.SingleProjects.at(i).Configuration.linker.LinkIncremental != unset) { + if ( tool.SingleProjects.at(i).Configuration.linker.LinkIncremental != linkIncrementalDefault) { const triState ts = (tool.SingleProjects.at(i).Configuration.linker.LinkIncremental == linkIncrementalYes ? _True : _False); xml << tag("LinkIncremental") << attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name)) |