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

vcxproj generator: append version suffix only to library targets

Browse Source 
Task-number: QTBUG-38066
Change-Id: I2f1635f2cb34acb388c380fc2fc3fbe4df04bb03
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Joerg Bornemann 2014-04-03 11:54:10 +02:00 committed by The Qt Project
parent 10a0ac759e
commit 826ab028a8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1002,9 +1002,11 @@ void VcprojGenerator::initConfiguration()
// The target name could have been changed. // The target name could have been changed.
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("TEMPLATE") == "vclib"
&& project->isActiveConfig("shared")) {
conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT").toQString()); conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT").toQString());
} }
}
if (conf.CompilerVersion >= NET2012) { if (conf.CompilerVersion >= NET2012) {
conf.WinRT = project->isActiveConfig("winrt"); conf.WinRT = project->isActiveConfig("winrt");