Commit 66a35531 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

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: default avatarEike Ziller <eike.ziller@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
parent c320f65d
......@@ -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)
}
LIBS *= -l$$qtLibraryName(Aggregation)
LIBS *= -l$$qtLibraryName(CPlusPlus)
include(../languageutils/languageutils.pri)
QTC_LIB_NAME = CPlusPlus
QTC_LIB_DEPENDS += \
languageutils
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty
include(extensionsystem_dependencies.pri)
LIBS *= -l$$qtLibraryName(ExtensionSystem)
include(../aggregation/aggregation.pri)
QTC_LIB_NAME = ExtensionSystem
QTC_LIB_DEPENDS += \
aggregation
LIBS *= -l$$qtLibraryName(GLSL)
include(../utils/utils.pri)
QTC_LIB_NAME = GLSL
QTC_LIB_DEPENDS += \
utils
LIBS *= -l$$qtLibraryName(LanguageUtils)
include(../utils/utils.pri)
QTC_LIB_NAME = LanguageUtils
QTC_LIB_DEPENDS += \
utils
LIBS *= -l$$qtLibraryName(QmlDebug)
LIBS *= -l$$qtLibraryName(QmlEditorWidgets)
include(../qmljs/qmljs.pri)
include(../utils/utils.pri)
QTC_LIB_NAME = QmlEditorWidgets
QTC_LIB_DEPENDS += \
qmljs \
utils
QT *= declarative
LIBS *= -l$$qtLibraryName(QmlJS)
include(../utils/utils.pri)
include(../languageutils/languageutils.pri)
QTC_LIB_NAME = QmlJS
QTC_LIB_DEPENDS += \
utils \
languageutils
include(ssh_dependencies.pri)
LIBS *= -l$$qtLibraryName(QtcSsh)
include(utils_dependencies.pri)
LIBS *= -l$$qtLibraryName(Utils)
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