AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "qmake vcxproj generator: map TARGET_EXT to $(TargetExt)"

Browse Source 
This reverts commit e81d7fd1e5.

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>
This commit is contained in:
Joerg Bornemann 2013-01-24 12:22:56 +01:00 committed by The Qt Project
parent 4730742f69
commit 99184f9461
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -476,11 +476,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
<< attrTag("Condition", condition) << attrTag("Condition", condition)
<< valueTag(tool.Configuration.PrimaryOutput); << 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) { if ( tool.Configuration.linker.IgnoreImportLibrary != unset) {
xml<< tag("IgnoreImportLibrary") xml<< tag("IgnoreImportLibrary")
<< attrTag("Condition", condition) << attrTag("Condition", condition)
@ -681,11 +677,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
<< attrTag("Condition", condition) << attrTag("Condition", condition)
<< valueTag(config.PrimaryOutput); << valueTag(config.PrimaryOutput);
} }
if (!config.PrimaryOutputExtension.isEmpty()) {
xml << tag("TargetExt")
<< attrTag("Condition", condition)
<< valueTag(config.PrimaryOutputExtension);
}
if (config.linker.IgnoreImportLibrary != unset) { if (config.linker.IgnoreImportLibrary != unset) {
xml << tag("IgnoreImportLibrary") xml << tag("IgnoreImportLibrary")
<< attrTag("Condition", condition) << attrTag("Condition", condition)

1
qmake/generators/win32/msvc_objectmodel.h
View File

@ -860,7 +860,6 @@ public:
QString ConfigurationName; QString ConfigurationName;
QString OutputDirectory; QString OutputDirectory;
QString PrimaryOutput; QString PrimaryOutput;
QString PrimaryOutputExtension;
QString ProgramDatabase; QString ProgramDatabase;
triState RegisterOutput; triState RegisterOutput;
useOfATL UseOfATL; useOfATL UseOfATL;

1
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -944,7 +944,6 @@ void VcprojGenerator::initConfiguration()
conf.PrimaryOutput = project->first("TARGET").toQString(); conf.PrimaryOutput = project->first("TARGET").toQString();
if ( !conf.PrimaryOutput.isEmpty() && !project->first("TARGET_VERSION_EXT").isEmpty() && project->isActiveConfig("shared")) if ( !conf.PrimaryOutput.isEmpty() && !project->first("TARGET_VERSION_EXT").isEmpty() && project->isActiveConfig("shared"))
conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT").toQString()); conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT").toQString());
conf.PrimaryOutputExtension = project->first("TARGET_EXT").toQString();
} }
conf.Name = project->values("BUILD_NAME").join(' '); conf.Name = project->values("BUILD_NAME").join(' ');