diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-04-03 09:54:10 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-08 10:47:12 (GMT) |
| commit | b510e64cc5405c0664200bf471b5ccbbe3b4d081 (patch) | |
| tree | 7adf0661d2d3e946af0082b11789d3a33c5dfed6 | |
| parent | 1ff6efe5ce1f0687d1ce44dcaa281fcbdfb90044 (diff) | |
| download | Qt-b510e64cc5405c0664200bf471b5ccbbe3b4d081.zip Qt-b510e64cc5405c0664200bf471b5ccbbe3b4d081.tar.gz Qt-b510e64cc5405c0664200bf471b5ccbbe3b4d081.tar.bz2 | |
vcxproj generator: append version suffix only to library targets
Task-number: QTBUG-38066
Change-Id: I2f1635f2cb34acb388c380fc2fc3fbe4df04bb03
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit qtbase/826ab028a8c24b115286d251938396ca1de71b56)
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 8ea8dca..c13ca4c 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -919,8 +919,10 @@ void VcprojGenerator::initConfiguration() if (conf.CompilerVersion >= NET2010) { // The target name could have been changed. conf.PrimaryOutput = project->first("TARGET"); - 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")); + } } conf.Name = project->values("BUILD_NAME").join(" "); |