diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-01-24 12:22:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-24 15:16:19 +0100 |
| commit | 99184f94618e0fc15adaa8fa7d2fbce74f2793b4 (patch) | |
| tree | 2b73e49436bc37635772dd8d4c2067361f4557e2 /qmake/generators | |
| parent | 4730742f69123fb814a780f2434fa9b5b39acede (diff) | |
Revert "qmake vcxproj generator: map TARGET_EXT to $(TargetExt)"
This reverts commit e81d7fd1e57fe2ce11cbe07636f890973116f7ab.
The insane logic that prepends the version number of a lib to
TARGET_EXT instead of appending it to TARGET breaks every vcxproj
with a library version.
Fixing this properly will require much more work and testing on all
supported Windows platforms.
Forward-port of 8869b3b3 in qt/qt.git.
Task-number: QTBUG-29286
Change-Id: Ib96de9c6f41995af013b146a00c850c9da3a9d8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 12 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 1 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 1 |
3 files changed, 2 insertions, 12 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index a5276b4b16..3e56911a38 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -476,11 +476,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool) << attrTag("Condition", condition) << valueTag(tool.Configuration.PrimaryOutput); } - if (!tool.Configuration.PrimaryOutputExtension.isEmpty()) { - xml<< tag("TargetExt") - << attrTag("Condition", condition) - << valueTag(tool.Configuration.PrimaryOutputExtension); - } + if ( tool.Configuration.linker.IgnoreImportLibrary != unset) { xml<< tag("IgnoreImportLibrary") << attrTag("Condition", condition) @@ -681,11 +677,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) << attrTag("Condition", condition) << valueTag(config.PrimaryOutput); } - if (!config.PrimaryOutputExtension.isEmpty()) { - xml << tag("TargetExt") - << attrTag("Condition", condition) - << valueTag(config.PrimaryOutputExtension); - } + if (config.linker.IgnoreImportLibrary != unset) { xml << tag("IgnoreImportLibrary") << attrTag("Condition", condition) diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 77bd2358fa..c3fae94179 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -860,7 +860,6 @@ public: QString ConfigurationName; QString OutputDirectory; QString PrimaryOutput; - QString PrimaryOutputExtension; QString ProgramDatabase; triState RegisterOutput; useOfATL UseOfATL; diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 048b4e49b0..b082fcb307 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -944,7 +944,6 @@ void VcprojGenerator::initConfiguration() conf.PrimaryOutput = project->first("TARGET").toQString(); if ( !conf.PrimaryOutput.isEmpty() && !project->first("TARGET_VERSION_EXT").isEmpty() && project->isActiveConfig("shared")) conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT").toQString()); - conf.PrimaryOutputExtension = project->first("TARGET_EXT").toQString(); } conf.Name = project->values("BUILD_NAME").join(' '); |