Add version number to lib dependencies on windows.

Change-Id: Ied3707f18cf2753679eeaa2bcff0edfba3c7517e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

10 files changed, 19 insertions, 10 deletions

diff --git a/qtcreator.pri b/qtcreator.pri
index 918d0d7b21..bd7f4d7409 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -9,7 +9,7 @@ BINARY_ARTIFACTS_BRANCH = master
 # enable c++11
 CONFIG += c++11
 
-defineReplace(qtLibraryName) {
+defineReplace(qtLibraryTargetName) {
    unset(LIBRARY_NAME)
    LIBRARY_NAME = $$1
    CONFIG(debug, debug|release) {
@@ -22,6 +22,15 @@ defineReplace(qtLibraryName) {
    return($$RET)
 }
 
+defineReplace(qtLibraryName) {
+   RET = $$qtLibraryTargetName($$1)
+   win32 {
+      VERSION_LIST = $$split(QTCREATOR_VERSION, .)
+      RET = $$RET$$first(VERSION_LIST)
+   }
+   return($$RET)
+}
+
 defineTest(minQtVersion) {
     maj = $$1
     min = $$2
diff --git a/src/qtcreatorlibrary.pri b/src/qtcreatorlibrary.pri
index c7a3f12dca..a4165a794f 100644
--- a/src/qtcreatorlibrary.pri
+++ b/src/qtcreatorlibrary.pri
@@ -18,7 +18,7 @@ osx {
 }
 include(rpath.pri)
 
-TARGET = $$qtLibraryName($$TARGET)
+TARGET = $$qtLibraryTargetName($$TARGET)
 
 TEMPLATE = lib
 CONFIG += shared dll
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index f86de2c313..fc5201f8e2 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -102,5 +102,5 @@ INSTALLS += target
 MIMETYPES = $$_PRO_FILE_PWD_/$${TARGET}.mimetypes.xml
 exists($$MIMETYPES):DISTFILES += $$MIMETYPES
 
-TARGET = $$qtLibraryName($$TARGET)
+TARGET = $$qtLibraryTargetName($$TARGET)
 
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
index 6afe681a8b..54dcfbabe8 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
@@ -10,5 +10,5 @@ QTC_LIB_DEPENDS += extensionsystem
 include(../../../../../../qtcreator.pri)
 include(../../../../qttestrpath.pri)
 
-TARGET = $$qtLibraryName(plugin1)
+TARGET = $$qtLibraryTargetName(plugin1)
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
index ce8fe64d55..c776d82fe4 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
@@ -10,5 +10,5 @@ QTC_LIB_DEPENDS += extensionsystem
 include(../../../../../../qtcreator.pri)
 include(../../../../qttestrpath.pri)
 
-TARGET = $$qtLibraryName(plugin2)
+TARGET = $$qtLibraryTargetName(plugin2)
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
index f828f6571d..243d5ac19a 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
@@ -10,5 +10,5 @@ QTC_LIB_DEPENDS += extensionsystem
 include(../../../../../../qtcreator.pri)
 include(../../../../qttestrpath.pri)
 
-TARGET = $$qtLibraryName(plugin3)
+TARGET = $$qtLibraryTargetName(plugin3)
 CONFIG -= debug_and_release_target
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
index 1b05d06de6..0f2bf10922 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
@@ -9,7 +9,7 @@ DISTFILES = $$PWD/plugin.json
 QTC_LIB_DEPENDS += extensionsystem
 include(../../../../qttest.pri)
 
-TARGET = $$qtLibraryName(plugin1)
+TARGET = $$qtLibraryTargetName(plugin1)
 CONFIG -= debug_and_release_target
 
 LIBS += -L$$OUT_PWD/../plugin2 -L$$OUT_PWD/../plugin3
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
index 3ec652ccf9..a168390bc7 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
@@ -9,7 +9,7 @@ DISTFILES = $$PWD/plugin.json
 QTC_LIB_DEPENDS += extensionsystem
 include(../../../../qttest.pri)
 
-TARGET = $$qtLibraryName(plugin2)
+TARGET = $$qtLibraryTargetName(plugin2)
 CONFIG -= debug_and_release_target
 
 macx {
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
index e31ae56089..c2ca37b905 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
@@ -9,7 +9,7 @@ DISTFILES = $$PWD/plugin.json
 QTC_LIB_DEPENDS += extensionsystem
 include(../../../../qttest.pri)
 
-TARGET = $$qtLibraryName(plugin3)
+TARGET = $$qtLibraryTargetName(plugin3)
 CONFIG -= debug_and_release_target
 
 LIBS += -L$$OUT_PWD/../plugin2
diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro
index 7f46e9212f..afc5f3c5e1 100644
--- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro
+++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro
@@ -9,5 +9,5 @@ QTC_LIB_DEPENDS += extensionsystem
 include(../../../../../qtcreator.pri)
 include(../../../qttestrpath.pri)
 
-TARGET = $$qtLibraryName(test)
+TARGET = $$qtLibraryTargetName(test)
 CONFIG -= debug_and_release_target