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>

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)
+}

src/libs/aggregation/aggregation.pri

@@ -1 +0,0 @@
-LIBS *= -l$$qtLibraryName(Aggregation)

src/libs/aggregation/aggregation_dependencies.pri

@@ -0,0 +1 @@
+QTC_LIB_NAME = Aggregation

src/libs/cplusplus/cplusplus.pri

@@ -1 +0,0 @@
-LIBS *= -l$$qtLibraryName(CPlusPlus)

src/libs/cplusplus/cplusplus_dependencies.pri

@@ -1,2 +1,4 @@
-include(../languageutils/languageutils.pri)
+QTC_LIB_NAME = CPlusPlus
+QTC_LIB_DEPENDS += \
+    languageutils
 INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty

src/libs/extensionsystem/extensionsystem.pri

@@ -1,3 +0,0 @@
-include(extensionsystem_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(ExtensionSystem)

src/libs/extensionsystem/extensionsystem_dependencies.pri

@@ -1 +1,3 @@
-include(../aggregation/aggregation.pri)
+QTC_LIB_NAME = ExtensionSystem
+QTC_LIB_DEPENDS += \
+    aggregation

src/libs/glsl/glsl.pri

@@ -1 +0,0 @@
-LIBS *= -l$$qtLibraryName(GLSL)

src/libs/glsl/glsl_dependencies.pri

@@ -1 +1,3 @@
-include(../utils/utils.pri)
+QTC_LIB_NAME = GLSL
+QTC_LIB_DEPENDS += \
+    utils

src/libs/languageutils/languageutils.pri

@@ -1 +0,0 @@
-LIBS *= -l$$qtLibraryName(LanguageUtils)

src/libs/languageutils/languageutils_dependencies.pri

@@ -1 +1,3 @@
-include(../utils/utils.pri)
+QTC_LIB_NAME = LanguageUtils
+QTC_LIB_DEPENDS += \
+    utils

src/libs/qmldebug/qmldebug.pri

@@ -1 +0,0 @@
-LIBS *= -l$$qtLibraryName(QmlDebug)

src/libs/qmldebug/qmldebug_dependencies.pri

@@ -0,0 +1 @@
+QTC_LIB_NAME = QmlDebug

src/libs/qmleditorwidgets/qmleditorwidgets.pri

@@ -1 +0,0 @@
-LIBS *= -l$$qtLibraryName(QmlEditorWidgets)

src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri

@@ -1,3 +1,5 @@
-include(../qmljs/qmljs.pri)
+QTC_LIB_NAME = QmlEditorWidgets
-include(../utils/utils.pri)
+QTC_LIB_DEPENDS += \
+    qmljs \
+    utils
 QT *= declarative

src/libs/qmljs/qmljs.pri

@@ -1 +0,0 @@
-LIBS *= -l$$qtLibraryName(QmlJS)

src/libs/qmljs/qmljs_dependencies.pri

@@ -1,2 +1,4 @@
-include(../utils/utils.pri)
+QTC_LIB_NAME = QmlJS
-include(../languageutils/languageutils.pri)
+QTC_LIB_DEPENDS += \
+    utils \
+    languageutils

src/libs/ssh/ssh.pri

@@ -1,2 +0,0 @@
-include(ssh_dependencies.pri)
-LIBS *= -l$$qtLibraryName(QtcSsh)

src/libs/ssh/ssh_dependencies.pri

@@ -0,0 +1 @@
+QTC_LIB_NAME = QtcSsh

src/libs/utils/utils.pri

@@ -1,2 +0,0 @@
-include(utils_dependencies.pri)
-LIBS *= -l$$qtLibraryName(Utils)

src/libs/utils/utils_dependencies.pri

@@ -0,0 +1 @@
+QTC_LIB_NAME = Utils

src/libs/zeroconf/zeroconf.pri

@@ -1 +0,0 @@
-LIBS *= -l$$qtLibraryName(zeroconf)

src/libs/zeroconf/zeroconf_dependencies.pri

@@ -0,0 +1 @@
+QTC_LIB_NAME = zeroconf

src/plugins/analyzerbase/analyzerbase.pri

@@ -1,3 +0,0 @@
-include(analyzerbase_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(AnalyzerBase)

src/plugins/analyzerbase/analyzerbase_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = AnalyzerBase
-include(../../libs/cplusplus/cplusplus.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/projectexplorer/projectexplorer.pri)
+    cplusplus
-include(../../plugins/remotelinux/remotelinux.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/cpptools/cpptools.pri)
+    coreplugin \
+    projectexplorer \
+    remotelinux \
+    cpptools

src/plugins/android/android.pri

@@ -1,3 +0,0 @@
-include(android_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(Android)

src/plugins/android/android_dependencies.pri

@@ -1,4 +1,6 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = Android
-include(../../plugins/debugger/debugger.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/projectexplorer/projectexplorer.pri)
+    coreplugin \
-include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
+    debugger \
+    projectexplorer \
+    qt4projectmanager

src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri

@@ -1,4 +1,6 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = AutotoolsProjectManager
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/cpptools/cpptools.pri)
+    projectexplorer \
-include(../../plugins/qtsupport/qtsupport.pri)
+    coreplugin \
+    cpptools \
+    qtsupport

src/plugins/bazaar/bazaar_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = Bazaar
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    utils
-include(../../plugins/vcsbase/vcsbase.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/utils/utils.pri)
+    projectexplorer \
+    texteditor \
+    coreplugin \
+    vcsbase

src/plugins/bineditor/bineditor_dependencies.pri

@@ -1,3 +1,6 @@
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_NAME = BinEditor
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    utils
+QTC_PLUGIN_DEPENDS += \
+    texteditor \
+    coreplugin

src/plugins/bookmarks/bookmarks_dependencies.pri

@@ -1,3 +1,5 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = Bookmarks
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/texteditor/texteditor.pri)
+    projectexplorer \
+    coreplugin \
+    texteditor

src/plugins/classview/classview_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_NAME = ClassView
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/cpptools/cpptools.pri)
+    utils
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/texteditor/texteditor.pri)
+    coreplugin \
+    cpptools \
+    projectexplorer \
+    texteditor

src/plugins/clearcase/clearcase_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = ClearCase
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    utils
-include(../../plugins/vcsbase/vcsbase.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/utils/utils.pri)
+    projectexplorer \
+    texteditor \
+    coreplugin \
+    vcsbase

src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri

@@ -1,4 +1,6 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = CMakeProjectManager
-include(../../plugins/cpptools/cpptools.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/texteditor/texteditor.pri)
+    projectexplorer \
-include(../../plugins/qtsupport/qtsupport.pri)
+    cpptools \
+    texteditor \
+    qtsupport

src/plugins/coreplugin/coreplugin.pri

@@ -1,2 +0,0 @@
-include(coreplugin_dependencies.pri)
-LIBS *= -l$$qtLibraryName(Core)

src/plugins/coreplugin/coreplugin_dependencies.pri

@@ -1,2 +1,4 @@
-include(../../libs/extensionsystem/extensionsystem.pri)
+QTC_PLUGIN_NAME = Core
-include(../../libs/utils/utils.pri)
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    utils

src/plugins/cpaster/cpaster_dependencies.pri

@@ -1,2 +1,4 @@
-include(../../plugins/texteditor/texteditor.pri)
+QTC_PLUGIN_NAME = CodePaster
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_DEPENDS += \
+    texteditor \
+    coreplugin

src/plugins/cpaster/frontend/frontend.pro

@@ -1,15 +1,18 @@
 TEMPLATE = app
 TARGET=cpaster
 
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    utils
+
 include(../../../../qtcreator.pri)
 include(../../../rpath.pri)
-include(../../../plugins/coreplugin/coreplugin.pri)
 
 CONFIG += console
 CONFIG -= app_bundle
 QT += network
 
-LIBS *= -L$$IDE_PLUGIN_PATH/QtProject
+LIBS *= -L$$IDE_PLUGIN_PATH/QtProject -l$$qtLibraryName(Core)
 QMAKE_RPATHDIR *= $$IDE_PLUGIN_PATH/QtProject
 
 DESTDIR=$$IDE_LIBEXEC_PATH

src/plugins/cppeditor/cppeditor.pri

@@ -1,3 +0,0 @@
-include(cppeditor_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(CppEditor)

src/plugins/cppeditor/cppeditor_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_NAME = CppEditor
-include(../../libs/cplusplus/cplusplus.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/texteditor/texteditor.pri)
+    utils \
-include(../../plugins/coreplugin/coreplugin.pri)
+    cplusplus
-include(../../plugins/cpptools/cpptools.pri)
+QTC_PLUGIN_DEPENDS += \
+    texteditor \
+    coreplugin \
+    cpptools

src/plugins/cpptools/cpptools.pri

@@ -1,3 +0,0 @@
-include(cpptools_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(CppTools)

src/plugins/cpptools/cpptools_dependencies.pri

@@ -1,6 +1,9 @@
-include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
+QTC_PLUGIN_NAME = CppTools
-include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
+QTC_LIB_DEPENDS += \
-include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri)
+    languageutils \
-include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri)
+    cplusplus
-include($$IDE_SOURCE_TREE/src/plugins/locator/locator.pri)
+QTC_PLUGIN_DEPENDS += \
-include($$IDE_SOURCE_TREE/src/plugins/find/find.pri)
+    projectexplorer \
+    texteditor \
+    locator \
+    find

src/plugins/cvs/cvs_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = CVS
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    utils
-include(../../plugins/vcsbase/vcsbase.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/utils/utils.pri)
+    projectexplorer \
+    texteditor \
+    coreplugin \
+    vcsbase

src/plugins/debugger/debugger.pri

@@ -1,3 +0,0 @@
-include(debugger_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(Debugger)

src/plugins/debugger/debugger_dependencies.pri

@@ -1,10 +1,13 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = Debugger
-include(../../plugins/cpptools/cpptools.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/find/find.pri)
+    cplusplus \
-include(../../plugins/projectexplorer/projectexplorer.pri)
+    utils \
-include(../../plugins/texteditor/texteditor.pri)
+    qmldebug \
-include(../../libs/cplusplus/cplusplus.pri)
+    qmljs \
-include(../../libs/utils/utils.pri)
+    ssh
-include(../../libs/qmljs/qmljs.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/qmldebug/qmldebug.pri)
+    coreplugin \
-include(../../libs/ssh/ssh.pri)
+    cpptools \
+    find \
+    projectexplorer \
+    texteditor

src/plugins/designer/designer.pri

@@ -1,3 +0,0 @@
-include(designer_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(Designer)

src/plugins/designer/designer_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../libs/cplusplus/cplusplus.pri)
+QTC_PLUGIN_NAME = Designer
-include(../../plugins/cpptools/cpptools.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/texteditor/texteditor.pri)
+    cplusplus \
-include(../../libs/utils/utils.pri)
+    utils
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_DEPENDS += \
+    cpptools \
+    texteditor \
+    coreplugin

src/plugins/diffeditor/diffeditor.pri

@@ -1,3 +0,0 @@
-include(diffeditor_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(DiffEditor)

src/plugins/diffeditor/diffeditor_dependencies.pri

@@ -1,3 +1,6 @@
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_NAME = DiffEditor
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    utils
+QTC_PLUGIN_DEPENDS += \
+    texteditor \
+    coreplugin

src/plugins/fakevim/fakevim_dependencies.pri

@@ -1,3 +1,5 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = FakeVim
-include(../../plugins/texteditor/texteditor.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/find/find.pri)
+    coreplugin \
+    texteditor \
+    find

src/plugins/find/find.pri

@@ -1,3 +0,0 @@
-include(find_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(Find)

src/plugins/find/find_dependencies.pri

@@ -1,2 +1,5 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = Find
-include(../../libs/utils/utils.pri)
+QTC_LIB_DEPENDS += \
+    utils
+QTC_PLUGIN_DEPENDS += \
+    coreplugin

src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri

@@ -1,4 +1,6 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = GenericProjectManager
-include(../../plugins/cpptools/cpptools.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/texteditor/texteditor.pri)
+    projectexplorer \
-include(../../plugins/qtsupport/qtsupport.pri)
+    cpptools \
+    texteditor \
+    qtsupport

src/plugins/git/git_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = Git
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    utils
-include(../../plugins/vcsbase/vcsbase.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/utils/utils.pri)
+    projectexplorer \
+    texteditor \
+    coreplugin \
+    vcsbase

src/plugins/glsleditor/glsleditor.pri

@@ -1,3 +0,0 @@
-include(qmljseditor_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(QmlJSEditor)

src/plugins/glsleditor/glsleditor_dependencies.pri

@@ -1,7 +1,10 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = GLSLEditor
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/projectexplorer/projectexplorer.pri)
+    glsl \
-include(../../plugins/cpptools/cpptools.pri)
+    utils \
-include(../../libs/glsl/glsl.pri)
+    cplusplus
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/cplusplus/cplusplus.pri)
+    coreplugin \
+    texteditor \
+    projectexplorer \
+    cpptools

src/plugins/helloworld/helloworld_dependencies.pri

@@ -1 +1,6 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = HelloWorld
+QTC_LIB_DEPENDS += \
+    # nothing here at this time
+
+QTC_PLUGIN_DEPENDS += \
+    coreplugin

src/plugins/help/help.pri

@@ -1,3 +0,0 @@
-include(help_dependencies.pri)
-
-LIBS *= -l$$qtLibraryTarget(Help)

src/plugins/help/help_dependencies.pri

@@ -1,4 +1,5 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = Help
-include(../../plugins/find/find.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/locator/locator.pri)
+    coreplugin \
-
+    find \
+    locator

src/plugins/imageviewer/imageviewer_dependencies.pri

@@ -1,2 +1,5 @@
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_NAME = ImageViewer
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_LIB_DEPENDS += \
+    utils
+QTC_PLUGIN_DEPENDS += \
+    coreplugin

src/plugins/locator/locator.pri

@@ -1,3 +0,0 @@
-include(locator_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(Locator)

src/plugins/locator/locator_dependencies.pri

@@ -1 +1,3 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = Locator
+QTC_PLUGIN_DEPENDS += \
+    coreplugin

src/plugins/macros/macros.pri

@@ -1,3 +0,0 @@
-include(macros_dependencies.pri)
-
-LIBS *= -l$$qtLibraryTarget(Macros)

src/plugins/macros/macros_dependencies.pri

@@ -1,4 +1,6 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = Macros
-include(../../plugins/locator/locator.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/find/find.pri)
+    coreplugin \
-include(../../plugins/texteditor/texteditor.pri)
+    locator \
+    find \
+    texteditor

src/plugins/madde/madde.pri

@@ -1,3 +0,0 @@
-include(madde_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(Madde)

src/plugins/madde/madde_dependencies.pri

@@ -1,2 +1,4 @@
-include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
+QTC_PLUGIN_NAME = Madde
-include(../../plugins/remotelinux/remotelinux.pri)
+QTC_PLUGIN_DEPENDS += \
+    qt4projectmanager \
+    remotelinux

src/plugins/mercurial/mercurial_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = Mercurial
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    utils
-include(../../plugins/vcsbase/vcsbase.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/utils/utils.pri)
+    projectexplorer \
+    texteditor \
+    coreplugin \
+    vcsbase

src/plugins/perforce/perforce_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = Perforce
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    utils
-include(../../plugins/vcsbase/vcsbase.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/utils/utils.pri)
+    projectexplorer \
+    texteditor \
+    coreplugin \
+    vcsbase

src/plugins/projectexplorer/projectexplorer.pri

@@ -1,2 +0,0 @@
-include(projectexplorer_dependencies.pri)
-LIBS *= -l$$qtLibraryName(ProjectExplorer)

src/plugins/projectexplorer/projectexplorer_dependencies.pri

@@ -1,7 +1,10 @@
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_NAME = ProjectExplorer
-include(../../libs/ssh/ssh.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/locator/locator.pri)
+    ssh \
-include(../../plugins/find/find.pri)
+    utils
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/texteditor/texteditor.pri)
+    locator \
+    find \
+    coreplugin \
+    texteditor
 QT *= network

src/plugins/pythoneditor/pythoneditor_dependencies.pri

@@ -1,3 +1,5 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = PythonEditor
-include(../../plugins/texteditor/texteditor.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/cpptools/cpptools.pri)
+    coreplugin \
+    texteditor \
+    cpptools

src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri

@@ -1,5 +1,7 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = QbsProjectManager
-include(../../plugins/cpptools/cpptools.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/texteditor/texteditor.pri)
+    projectexplorer \
-include(../../plugins/qtsupport/qtsupport.pri)
+    cpptools \
-include(../../plugins/qmljstools/qmljstools.pri)
+    texteditor \
+    qtsupport \
+    qmljstools

src/plugins/qmldesigner/qmldesigner.pri

@@ -1,13 +0,0 @@
-include(qmldesigner_dependencies.pri)
-include(designercore/designercore.pri)
-LIBS *= -l$$qtLibraryName(QmlDesigner)
-INCLUDEPATH *= $$PWD/components/componentcore
-INCLUDEPATH *= $$PWD/components/formeditor
-INCLUDEPATH *= $$PWD/components/itemlibrary
-INCLUDEPATH *= $$PWD/components/navigator
-INCLUDEPATH *= $$PWD/components/propertyeditor
-INCLUDEPATH *= $$PWD/components/stateseditor
-INCLUDEPATH *= $$PWD/components/debugview
-INCLUDEPATH *= $$PWD/components/integration
-INCLUDEPATH *= $$PWD/components/logger
-INCLUDEPATH *= $$QTCREATOR_SOURCES/share/qtcreator/qml/qmlpuppet/interfaces

src/plugins/qmldesigner/qmldesigner_dependencies.pri

@@ -1,9 +1,12 @@
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_NAME = QmlDesigner
-include(../../libs/qmljs/qmljs.pri)
+QTC_LIB_DEPENDS += \
-include(../../libs/qmleditorwidgets/qmleditorwidgets.pri)
+    utils \
-include(../coreplugin/coreplugin.pri)
+    qmljs \
-include(../texteditor/texteditor.pri)
+    qmleditorwidgets
-include(../qmljseditor/qmljseditor.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../qt4projectmanager/qt4projectmanager.pri)
+    coreplugin \
-include(../qmlprojectmanager/qmlprojectmanager.pri)
+    texteditor \
-include(../projectexplorer/projectexplorer.pri)
+    qmljseditor \
+    qt4projectmanager \
+    qmlprojectmanager \
+    projectexplorer

src/plugins/qmljseditor/qmljseditor.pri

@@ -1,3 +0,0 @@
-include(qmljseditor_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(QmlJSEditor)

src/plugins/qmljseditor/qmljseditor_dependencies.pri

@@ -1,6 +1,9 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = QmlJSEditor
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/projectexplorer/projectexplorer.pri)
+    utils \
-include(../../plugins/qmljstools/qmljstools.pri)
+    qmleditorwidgets
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/qmleditorwidgets/qmleditorwidgets.pri)
+    coreplugin \
+    texteditor \
+    projectexplorer \
+    qmljstools

src/plugins/qmljstools/qmljstools.pri

@@ -1,3 +0,0 @@
-include(qmljstools_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(QmlJSTools)

src/plugins/qmljstools/qmljstools_dependencies.pri

@@ -1,7 +1,10 @@
-include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
+QTC_PLUGIN_NAME = QmlJSTools
-include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
+QTC_LIB_DEPENDS += \
-include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri)
+    languageutils \
-include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri)
+    cplusplus \
-include($$IDE_SOURCE_TREE/src/plugins/qtsupport/qtsupport.pri)
+    qmljs
-include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri)
+QTC_PLUGIN_DEPENDS += \
-include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
+    projectexplorer \
+    qtsupport \
+    texteditor \
+    cpptools

src/plugins/qmlprofiler/qmlprofiler_dependencies.pri

@@ -1,8 +1,11 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = QmlProfiler
-include(../../plugins/analyzerbase/analyzerbase.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/qmlprojectmanager/qmlprojectmanager.pri)
+    qmldebug \
-include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
+    extensionsystem
-include(../../plugins/qmljstools/qmljstools.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/remotelinux/remotelinux.pri)
+    coreplugin \
-include(../../libs/qmldebug/qmldebug.pri)
+    analyzerbase \
-include(../../libs/extensionsystem/extensionsystem.pri)
+    qmlprojectmanager \
+    qt4projectmanager \
+    qmljstools \
+    remotelinux

src/plugins/qmlprojectmanager/qmlprojectmanager.pri

@@ -1,2 +0,0 @@
-include(qmlprojectmanager_dependencies.pri)
-LIBS *= -l$$qtLibraryName(QmlProjectManager)

src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri

@@ -1,6 +1,8 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = QmlProjectManager
-include(../../plugins/texteditor/texteditor.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/qmljseditor/qmljseditor.pri)
+    projectexplorer \
-include(../../plugins/qmljstools/qmljstools.pri)
+    texteditor \
-include(../../plugins/debugger/debugger.pri)
+    qmljseditor \
-include(../../plugins/qtsupport/qtsupport.pri)
+    qmljstools \
+    debugger \
+    qtsupport

src/plugins/qnx/qnx_dependencies.pri

@@ -1,4 +1,6 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = Qnx
-include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/remotelinux/remotelinux.pri)
+    coreplugin \
-include(../../plugins/texteditor/texteditor.pri)
+    qt4projectmanager \
+    remotelinux \
+    texteditor

src/plugins/qt4projectmanager/qt4projectmanager.pri

@@ -1,3 +0,0 @@
-include(qt4projectmanager_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(Qt4ProjectManager)

src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri

@@ -1,6 +1,9 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = Qt4ProjectManager
-include(../../plugins/qtsupport/qtsupport.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/cpptools/cpptools.pri)
+    qmljs
-include(../../plugins/debugger/debugger.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/qmljs/qmljs.pri)
+    projectexplorer \
-include(../../plugins/qmljstools/qmljstools.pri)
+    qtsupport \
+    cpptools \
+    debugger \
+    qmljstools

src/plugins/qtsupport/qtsupport.pri

@@ -1,3 +0,0 @@
-include(qtsupport_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(QtSupport)

src/plugins/qtsupport/qtsupport_dependencies.pri

@@ -1,6 +1,9 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = QtSupport
-include(../../libs/qmljs/qmljs.pri)
+QTC_LIB_DEPENDS += \
-include(../../libs/utils/utils.pri)
+    qmljs \
+    utils
+QTC_PLUGIN_DEPENDS += \
+    projectexplorer
 DEFINES *= \
     QMAKE_AS_LIBRARY \
     PROPARSER_THREAD_SAFE \

src/plugins/remotelinux/remotelinux.pri

@@ -1,3 +0,0 @@
-include(remotelinux_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(RemoteLinux)

src/plugins/remotelinux/remotelinux_dependencies.pri

@@ -1,4 +1,6 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = RemoteLinux
-include(../../plugins/debugger/debugger.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/projectexplorer/projectexplorer.pri)
+    coreplugin \
-include(../../plugins/qtsupport/qtsupport.pri)
+    debugger \
+    projectexplorer \
+    qtsupport

src/plugins/resourceeditor/resourceeditor_dependencies.pri

@@ -1,3 +1,6 @@
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_NAME = ResourceEditor
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/find/find.pri)
+    utils
+QTC_PLUGIN_DEPENDS += \
+    coreplugin \
+    find

src/plugins/subversion/subversion_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_NAME = Subversion
-include(../../plugins/texteditor/texteditor.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    utils
-include(../../plugins/vcsbase/vcsbase.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/utils/utils.pri)
+    projectexplorer \
+    texteditor \
+    coreplugin \
+    vcsbase

src/plugins/tasklist/tasklist_dependencies.pri

@@ -1,2 +1,4 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = TaskList
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_PLUGIN_DEPENDS += \
+    coreplugin \
+    projectexplorer

src/plugins/texteditor/texteditor.pri

@@ -1,3 +0,0 @@
-include(texteditor_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(TextEditor)

src/plugins/texteditor/texteditor_dependencies.pri

@@ -1,4 +1,7 @@
-include(../../libs/utils/utils.pri)
+QTC_PLUGIN_NAME = TextEditor
-include(../../plugins/find/find.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/locator/locator.pri)
+    utils
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_DEPENDS += \
+    find \
+    locator \
+    coreplugin

src/plugins/todo/todo_dependencies.pri

@@ -1,5 +1,8 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = Todo
-include(../../plugins/projectexplorer/projectexplorer.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/texteditor/texteditor.pri)
+    qmljs
-include(../../plugins/cpptools/cpptools.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/qmljs/qmljs.pri)
+    coreplugin \
+    projectexplorer \
+    texteditor \
+    cpptools

src/plugins/updateinfo/updateinfo_dependencies.pri

@@ -1,2 +1,5 @@
-include(../../libs/extensionsystem/extensionsystem.pri)
+QTC_PLUGIN_NAME = UpdateInfo
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_LIB_DEPENDS += \
+    extensionsystem
+QTC_PLUGIN_DEPENDS += \
+    coreplugin

src/plugins/valgrind/valgrind.pri

@@ -1,3 +0,0 @@
-include(valgrind_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(Valgrind)

src/plugins/valgrind/valgrind_dependencies.pri

@@ -1,6 +1,9 @@
-include(../../libs/cplusplus/cplusplus.pri)
+QTC_PLUGIN_NAME = Valgrind
-include(../../plugins/analyzerbase/analyzerbase.pri)
+QTC_LIB_DEPENDS += \
-include(../../plugins/coreplugin/coreplugin.pri)
+    cplusplus \
-include(../../plugins/texteditor/texteditor.pri)
+    utils
-include(../../plugins/remotelinux/remotelinux.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../libs/utils/utils.pri)
+    analyzerbase \
+    coreplugin \
+    texteditor \
+    remotelinux

src/plugins/vcsbase/vcsbase.pri

@@ -1,3 +0,0 @@
-include(vcsbase_dependencies.pri)
-
-LIBS *= -l$$qtLibraryName(VcsBase)

src/plugins/vcsbase/vcsbase_dependencies.pri

@@ -1,5 +1,7 @@
-include(../../plugins/coreplugin/coreplugin.pri)
+QTC_PLUGIN_NAME = VcsBase
-include(../../plugins/texteditor/texteditor.pri)
+QTC_PLUGIN_DEPENDS += \
-include(../../plugins/projectexplorer/projectexplorer.pri)
+    coreplugin \
-include(../../plugins/find/find.pri)
+    texteditor \
-include(../../plugins/cpptools/cpptools.pri)
+    projectexplorer \
+    find \
+    cpptools

src/plugins/welcome/welcome.pri

@@ -1,3 +0,0 @@
-include(welcome_dependencies.pri)
-
-LIBS *= -l$$qtLibraryTarget(Welcome)