diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-25 19:09:49 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-03 14:37:45 +0200 |
| commit | 66a3553107a43f56372f756b218e268e71390d19 (patch) | |
| tree | 8e3f7d31f29d3760ba450f7ed6caf4da6ebed12f /qtcreator.pri | |
| parent | c320f65d1cd58f86061c09cf5992603e26af5871 (diff) | |
| download | qt-creator-66a3553107a43f56372f756b218e268e71390d19.tar.gz | |
make library and plugin dependencies declarative
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.
Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index a384e36a50..efc264bc3d 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -191,3 +191,31 @@ qt:greaterThan(QT_MAJOR_VERSION, 4) { QBSFILE = $$replace(_PRO_FILE_, \\.pro$, .qbs) exists($$QBSFILE):OTHER_FILES += $$QBSFILE + +# recursively resolve plugin deps +done_plugins = +for(ever) { + isEmpty(QTC_PLUGIN_DEPENDS): \ + break() + done_plugins += $$QTC_PLUGIN_DEPENDS + for(dep, QTC_PLUGIN_DEPENDS) { + include($$PWD/src/plugins/$$dep/$${dep}_dependencies.pri) + LIBS += -l$$qtLibraryName($$QTC_PLUGIN_NAME) + } + QTC_PLUGIN_DEPENDS = $$unique(QTC_PLUGIN_DEPENDS) + QTC_PLUGIN_DEPENDS -= $$unique(done_plugins) +} + +# recursively resolve library deps +done_libs = +for(ever) { + isEmpty(QTC_LIB_DEPENDS): \ + break() + done_libs += $$QTC_LIB_DEPENDS + for(dep, QTC_LIB_DEPENDS) { + include($$PWD/src/libs/$$dep/$${dep}_dependencies.pri) + LIBS += -l$$qtLibraryName($$QTC_LIB_NAME) + } + QTC_LIB_DEPENDS = $$unique(QTC_LIB_DEPENDS) + QTC_LIB_DEPENDS -= $$unique(done_libs) +} |