From 1f1be705463c9ad240055c58257fc78221d9ae51 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 4 May 2018 11:43:07 +0200 Subject: Version bump to 4.6.2 Change-Id: I34702cbff029caa071f4e3556350011d84d26f2a Reviewed-by: Eike Ziller --- qtcreator.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qtcreator.pri') diff --git a/qtcreator.pri b/qtcreator.pri index 5c3a9666a2..777cf3fb76 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,10 +1,10 @@ !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") QTCREATOR_PRI_INCLUDED = 1 -QTCREATOR_VERSION = 4.6.1 +QTCREATOR_VERSION = 4.6.2 QTCREATOR_COMPAT_VERSION = 4.6.0 VERSION = $$QTCREATOR_VERSION -QTCREATOR_DISPLAY_VERSION = 4.6.1 +QTCREATOR_DISPLAY_VERSION = 4.6.2 QTCREATOR_COPYRIGHT_YEAR = 2018 BINARY_ARTIFACTS_BRANCH = 4.6 -- cgit v1.2.3 From 2c5e8e8d64862966d90586a0c7120225d7831567 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 8 May 2018 10:52:49 +0200 Subject: Support out of source support libraries It was not possible to use QTC_LIB_DEPENDS if the library is not in the Qt Creator source tree. Provide a QTC_LIB_DIRS variable, similar to QTC_PLUGIN_DIRS. Task-number: QTCREATORBUG-20382 Change-Id: I9120d221b6567f699881c0ad00d1f1e49ef3b920 Reviewed-by: Oswald Buddenhagen --- qtcreator.pri | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'qtcreator.pri') diff --git a/qtcreator.pri b/qtcreator.pri index 777cf3fb76..cd899bc133 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -193,6 +193,13 @@ for(dir, QTC_PLUGIN_DIRS) { INCLUDEPATH += $$dir } +QTC_LIB_DIRS_FROM_ENVIRONMENT = $$(QTC_LIB_DIRS) +QTC_LIB_DIRS += $$split(QTC_LIB_DIRS_FROM_ENVIRONMENT, $$QMAKE_DIRLIST_SEP) +QTC_LIB_DIRS += $$IDE_SOURCE_TREE/src/libs +for(dir, QTC_LIB_DIRS) { + INCLUDEPATH += $$dir +} + CONFIG += \ depend_includepath \ no_include_pwd @@ -276,7 +283,16 @@ for(ever) { break() done_libs += $$QTC_LIB_DEPENDS for(dep, QTC_LIB_DEPENDS) { - include($$PWD/src/libs/$$dep/$${dep}_dependencies.pri) + dependencies_file = + for(dir, QTC_LIB_DIRS) { + exists($$dir/$$dep/$${dep}_dependencies.pri) { + dependencies_file = $$dir/$$dep/$${dep}_dependencies.pri + break() + } + } + isEmpty(dependencies_file): \ + error("Library dependency $$dep not found") + include($$dependencies_file) LIBS += -l$$qtLibraryName($$QTC_LIB_NAME) } QTC_LIB_DEPENDS = $$unique(QTC_LIB_DEPENDS) -- cgit v1.2.3