diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-10-17 13:31:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-18 02:58:08 +0200 |
| commit | 8869b3b30a29b1dd4218b3f5ac0bec9dd936b664 (patch) | |
| tree | 3d054455daa79257850235f9b1287a4952a70c91 /qmake | |
| parent | 7c99fed1373829835d926081c43a5426bc4d2cb6 (diff) | |
| download | qt4-tools-8869b3b30a29b1dd4218b3f5ac0bec9dd936b664.tar.gz | |
Revert "qmake vcxproj generator: map TARGET_EXT to $(TargetExt)"
This reverts commit 06f0d8a1a9a1d8d46e6f4f3894d76781dfb6638c.
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. Therefore we're reverting the fix for
QTBUG-26782 and mark it as "won't fix" for Qt4.
Task-number: QTBUG-26782
Task-number: QTBUG-27554
Change-Id: I0e3d0f0f3976e9ca958574364ec1b2668e1f66f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake')
| -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 a8c172db2e..5df47186c4 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -455,11 +455,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) @@ -654,11 +650,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 bd3472bec9..23d0bc330d 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -856,7 +856,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 d06ae762d5..56f004e5bb 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -897,7 +897,6 @@ void VcprojGenerator::initConfiguration() conf.PrimaryOutput = project->first("TARGET"); if ( !conf.PrimaryOutput.isEmpty() && !project->first("TARGET_VERSION_EXT").isEmpty() && project->isActiveConfig("shared")) conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT")); - conf.PrimaryOutputExtension = project->first("TARGET_EXT"); } conf.Name = project->values("BUILD_NAME").join(" "); |