Commit 8da31c87 authored by David Schulz's avatar David Schulz Committed by Christian Stenger

Add version number to lib dependencies on windows.

Change-Id: Ied3707f18cf2753679eeaa2bcff0edfba3c7517e
Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@theqtcompany.com>
parent fb3ffe4c
......@@ -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
......
......@@ -18,7 +18,7 @@ osx {
}
include(rpath.pri)
TARGET = $$qtLibraryName($$TARGET)
TARGET = $$qtLibraryTargetName($$TARGET)
TEMPLATE = lib
CONFIG += shared dll
......
......@@ -102,5 +102,5 @@ INSTALLS += target
MIMETYPES = $$_PRO_FILE_PWD_/$${TARGET}.mimetypes.xml
exists($$MIMETYPES):DISTFILES += $$MIMETYPES
TARGET = $$qtLibraryName($$TARGET)
TARGET = $$qtLibraryTargetName($$TARGET)
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......
......@@ -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 {
......
......@@ -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
......
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment