diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-12-18 11:02:16 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-12-18 11:02:16 +0100 |
| commit | e035ae6df1cdd3ac2e57fe60dfa92243c5a7964f (patch) | |
| tree | 58102886f9173683f2b88907ff2494ce9940c77c /qtcreator.pri | |
| parent | fca56658bb6d0358e7b86f56cf7e40fba8644bce (diff) | |
| parent | 1193cfa092ee7b3694d2aa5fede19fb86e224024 (diff) | |
| download | qt-creator-e035ae6df1cdd3ac2e57fe60dfa92243c5a7964f.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
share/qtcreator/debugger/stdtypes.py
src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp
Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 5111639181..318a4db2a7 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -151,8 +151,12 @@ macx { INCLUDEPATH += \ $$IDE_BUILD_TREE/src \ # for <app/app_version.h> $$IDE_SOURCE_TREE/src/libs \ - $$IDE_SOURCE_TREE/tools \ - $$IDE_SOURCE_TREE/src/plugins + $$IDE_SOURCE_TREE/tools + +QTC_PLUGIN_DIRS += $$IDE_SOURCE_TREE/src/plugins +for (dir, QTC_PLUGIN_DIRS) { + INCLUDEPATH += $$dir +} CONFIG += depend_includepath @@ -201,7 +205,16 @@ for(ever) { break() done_plugins += $$QTC_PLUGIN_DEPENDS for(dep, QTC_PLUGIN_DEPENDS) { - include($$PWD/src/plugins/$$dep/$${dep}_dependencies.pri) + dependencies_file = + for(dir, QTC_PLUGIN_DIRS) { + exists($$dir/$$dep/$${dep}_dependencies.pri) { + dependencies_file = $$dir/$$dep/$${dep}_dependencies.pri + break() + } + } + isEmpty(dependencies_file): \ + error("Plugin dependency $$dep not found") + include($$dependencies_file) LIBS += -l$$qtLibraryName($$QTC_PLUGIN_NAME) } QTC_PLUGIN_DEPENDS = $$unique(QTC_PLUGIN_DEPENDS) |