diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-14 09:44:43 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-14 09:44:43 +0200 |
| commit | 2278ebed1e0d290861a5616f4238eeec68607443 (patch) | |
| tree | e1e475b97c1cbe461c38a502c23afb8c9c49b2b1 /qtcreator.pri | |
| parent | b67db8bc221a9b2a413cf9748ab0239a17ccb683 (diff) | |
| parent | 3cfc715d7d33b724ad896c540af4a914d922e9bc (diff) | |
Merge remote-tracking branch 'origin/4.6' into 4.7
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
Change-Id: I873a2fa112321225e7b478739fc017b01d24ce18
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 9e681b65cb..d7600b4c32 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) |