From 66a3553107a43f56372f756b218e268e71390d19 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 Mar 2013 19:09:49 +0100 Subject: [PATCH] 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 Reviewed-by: Tobias Hunger Reviewed-by: Oswald Buddenhagen --- qtcreator.pri | 28 +++++++++++++++++++ src/libs/aggregation/aggregation.pri | 1 - .../aggregation/aggregation_dependencies.pri | 1 + src/libs/cplusplus/cplusplus.pri | 1 - src/libs/cplusplus/cplusplus_dependencies.pri | 4 ++- src/libs/extensionsystem/extensionsystem.pri | 3 -- .../extensionsystem_dependencies.pri | 4 ++- src/libs/glsl/glsl.pri | 1 - src/libs/glsl/glsl_dependencies.pri | 4 ++- src/libs/languageutils/languageutils.pri | 1 - .../languageutils_dependencies.pri | 4 ++- src/libs/qmldebug/qmldebug.pri | 1 - src/libs/qmldebug/qmldebug_dependencies.pri | 1 + .../qmleditorwidgets/qmleditorwidgets.pri | 1 - .../qmleditorwidgets_dependencies.pri | 6 ++-- src/libs/qmljs/qmljs.pri | 1 - src/libs/qmljs/qmljs_dependencies.pri | 6 ++-- src/libs/ssh/ssh.pri | 2 -- src/libs/ssh/ssh_dependencies.pri | 1 + src/libs/utils/utils.pri | 2 -- src/libs/utils/utils_dependencies.pri | 1 + src/libs/zeroconf/zeroconf.pri | 1 - src/libs/zeroconf/zeroconf_dependencies.pri | 1 + src/plugins/analyzerbase/analyzerbase.pri | 3 -- .../analyzerbase_dependencies.pri | 13 +++++---- src/plugins/android/android.pri | 3 -- src/plugins/android/android_dependencies.pri | 10 ++++--- .../autotoolsprojectmanager_dependencies.pri | 10 ++++--- src/plugins/bazaar/bazaar_dependencies.pri | 13 +++++---- .../bineditor/bineditor_dependencies.pri | 9 ++++-- .../bookmarks/bookmarks_dependencies.pri | 8 ++++-- .../classview/classview_dependencies.pri | 13 +++++---- .../clearcase/clearcase_dependencies.pri | 13 +++++---- .../cmakeprojectmanager_dependencies.pri | 10 ++++--- src/plugins/coreplugin/coreplugin.pri | 2 -- .../coreplugin/coreplugin_dependencies.pri | 6 ++-- src/plugins/cpaster/cpaster_dependencies.pri | 6 ++-- src/plugins/cpaster/frontend/frontend.pro | 7 +++-- src/plugins/cppeditor/cppeditor.pri | 3 -- .../cppeditor/cppeditor_dependencies.pri | 13 +++++---- src/plugins/cpptools/cpptools.pri | 3 -- .../cpptools/cpptools_dependencies.pri | 15 ++++++---- src/plugins/cvs/cvs_dependencies.pri | 13 +++++---- src/plugins/debugger/debugger.pri | 3 -- .../debugger/debugger_dependencies.pri | 23 ++++++++------- src/plugins/designer/designer.pri | 3 -- .../designer/designer_dependencies.pri | 13 +++++---- src/plugins/diffeditor/diffeditor.pri | 3 -- .../diffeditor/diffeditor_dependencies.pri | 9 ++++-- src/plugins/fakevim/fakevim_dependencies.pri | 8 ++++-- src/plugins/find/find.pri | 3 -- src/plugins/find/find_dependencies.pri | 7 +++-- .../genericprojectmanager_dependencies.pri | 10 ++++--- src/plugins/git/git_dependencies.pri | 13 +++++---- src/plugins/glsleditor/glsleditor.pri | 3 -- .../glsleditor/glsleditor_dependencies.pri | 17 ++++++----- .../helloworld/helloworld_dependencies.pri | 7 ++++- src/plugins/help/help.pri | 3 -- src/plugins/help/help_dependencies.pri | 9 +++--- .../imageviewer/imageviewer_dependencies.pri | 7 +++-- src/plugins/locator/locator.pri | 3 -- src/plugins/locator/locator_dependencies.pri | 4 ++- src/plugins/macros/macros.pri | 3 -- src/plugins/macros/macros_dependencies.pri | 10 ++++--- src/plugins/madde/madde.pri | 3 -- src/plugins/madde/madde_dependencies.pri | 6 ++-- .../mercurial/mercurial_dependencies.pri | 13 +++++---- .../perforce/perforce_dependencies.pri | 13 +++++---- .../projectexplorer/projectexplorer.pri | 2 -- .../projectexplorer_dependencies.pri | 15 ++++++---- .../pythoneditor_dependencies.pri | 8 ++++-- .../qbsprojectmanager_dependencies.pri | 12 ++++---- src/plugins/qmldesigner/qmldesigner.pri | 13 --------- .../qmldesigner/qmldesigner_dependencies.pri | 21 ++++++++------ src/plugins/qmljseditor/qmljseditor.pri | 3 -- .../qmljseditor/qmljseditor_dependencies.pri | 15 ++++++---- src/plugins/qmljstools/qmljstools.pri | 3 -- .../qmljstools/qmljstools_dependencies.pri | 17 ++++++----- .../qmlprofiler/qmlprofiler_dependencies.pri | 19 +++++++------ .../qmlprojectmanager/qmlprojectmanager.pri | 2 -- .../qmlprojectmanager_dependencies.pri | 14 ++++++---- src/plugins/qnx/qnx_dependencies.pri | 10 ++++--- .../qt4projectmanager/qt4projectmanager.pri | 3 -- .../qt4projectmanager_dependencies.pri | 15 ++++++---- src/plugins/qtsupport/qtsupport.pri | 3 -- .../qtsupport/qtsupport_dependencies.pri | 9 ++++-- src/plugins/remotelinux/remotelinux.pri | 3 -- .../remotelinux/remotelinux_dependencies.pri | 10 ++++--- .../resourceeditor_dependencies.pri | 9 ++++-- .../subversion/subversion_dependencies.pri | 13 +++++---- .../tasklist/tasklist_dependencies.pri | 6 ++-- src/plugins/texteditor/texteditor.pri | 3 -- .../texteditor/texteditor_dependencies.pri | 11 +++++--- src/plugins/todo/todo_dependencies.pri | 13 +++++---- .../updateinfo/updateinfo_dependencies.pri | 7 +++-- src/plugins/valgrind/valgrind.pri | 3 -- .../valgrind/valgrind_dependencies.pri | 15 ++++++---- src/plugins/vcsbase/vcsbase.pri | 3 -- src/plugins/vcsbase/vcsbase_dependencies.pri | 12 ++++---- src/plugins/welcome/welcome.pri | 3 -- src/plugins/welcome/welcome_dependencies.pri | 7 +++-- src/qtcreatorlibrary.pri | 4 +-- src/qtcreatorplugin.pri | 4 +-- src/tools/sdktool/sdktool.pro | 4 ++- tests/auto/aggregation/aggregation.pro | 2 +- tests/auto/changeset/changeset.pro | 4 +-- tests/auto/cplusplus/shared/shared.pri | 2 +- tests/auto/debugger/dumpers.pro | 2 +- tests/auto/debugger/gdb.pro | 2 +- tests/auto/debugger/namedemangler.pro | 3 +- tests/auto/diff/differ/differ.pro | 4 +-- tests/auto/environment/environment.pro | 2 +- .../circularplugins/plugin1/plugin1.pro | 2 +- .../circularplugins/plugin2/plugin2.pro | 2 +- .../circularplugins/plugin3/plugin3.pro | 2 +- .../correctplugins1/plugin1/plugin1.pro | 2 +- .../correctplugins1/plugin2/plugin2.pro | 2 +- .../correctplugins1/plugin3/plugin3.pro | 2 +- .../extensionsystem/pluginmanager/test.pro | 2 +- .../auto/extensionsystem/pluginspec/test.pro | 2 +- .../pluginspec/testplugin/testplugin.pro | 2 +- tests/auto/filesearch/filesearch.pro | 3 +- tests/auto/qtcprocess/qtcprocess.pro | 2 +- tests/auto/utils/fileutils/fileutils.pro | 3 +- .../utils_stringutils/utils_stringutils.pro | 2 +- .../callgrind/callgrindparsertests.pro | 3 +- tests/auto/valgrind/memcheck/modeldemo.pro | 3 +- tests/auto/valgrind/memcheck/parsertests.pro | 3 +- tests/auto/valgrind/memcheck/testrunner.pro | 3 +- tests/manual/preprocessor/preprocessor.pro | 8 +++--- tests/manual/process/process.pro | 2 +- tests/manual/ssh/ssh.pri | 2 +- .../tcpportsgatherer/tcpportsgatherer.pro | 2 +- tests/tools/qml-ast2dot/qml-ast2dot.pro | 5 +--- 134 files changed, 458 insertions(+), 381 deletions(-) delete mode 100644 src/libs/aggregation/aggregation.pri delete mode 100644 src/libs/cplusplus/cplusplus.pri delete mode 100644 src/libs/extensionsystem/extensionsystem.pri delete mode 100644 src/libs/glsl/glsl.pri delete mode 100644 src/libs/languageutils/languageutils.pri delete mode 100644 src/libs/qmldebug/qmldebug.pri delete mode 100644 src/libs/qmleditorwidgets/qmleditorwidgets.pri delete mode 100644 src/libs/qmljs/qmljs.pri delete mode 100644 src/libs/ssh/ssh.pri delete mode 100644 src/libs/utils/utils.pri delete mode 100644 src/libs/zeroconf/zeroconf.pri delete mode 100644 src/plugins/analyzerbase/analyzerbase.pri delete mode 100644 src/plugins/android/android.pri delete mode 100644 src/plugins/coreplugin/coreplugin.pri delete mode 100644 src/plugins/cppeditor/cppeditor.pri delete mode 100644 src/plugins/cpptools/cpptools.pri delete mode 100644 src/plugins/debugger/debugger.pri delete mode 100644 src/plugins/designer/designer.pri delete mode 100644 src/plugins/diffeditor/diffeditor.pri delete mode 100644 src/plugins/find/find.pri delete mode 100644 src/plugins/glsleditor/glsleditor.pri delete mode 100644 src/plugins/help/help.pri delete mode 100644 src/plugins/locator/locator.pri delete mode 100644 src/plugins/macros/macros.pri delete mode 100644 src/plugins/madde/madde.pri delete mode 100644 src/plugins/projectexplorer/projectexplorer.pri delete mode 100644 src/plugins/qmldesigner/qmldesigner.pri delete mode 100644 src/plugins/qmljseditor/qmljseditor.pri delete mode 100644 src/plugins/qmljstools/qmljstools.pri delete mode 100644 src/plugins/qmlprojectmanager/qmlprojectmanager.pri delete mode 100644 src/plugins/qt4projectmanager/qt4projectmanager.pri delete mode 100644 src/plugins/qtsupport/qtsupport.pri delete mode 100644 src/plugins/remotelinux/remotelinux.pri delete mode 100644 src/plugins/texteditor/texteditor.pri delete mode 100644 src/plugins/valgrind/valgrind.pri delete mode 100644 src/plugins/vcsbase/vcsbase.pri delete mode 100644 src/plugins/welcome/welcome.pri diff --git a/qtcreator.pri b/qtcreator.pri index a384e36a507..efc264bc3da 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) +} diff --git a/src/libs/aggregation/aggregation.pri b/src/libs/aggregation/aggregation.pri deleted file mode 100644 index fc6ddc81f54..00000000000 --- a/src/libs/aggregation/aggregation.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(Aggregation) diff --git a/src/libs/aggregation/aggregation_dependencies.pri b/src/libs/aggregation/aggregation_dependencies.pri index e69de29bb2d..8e5082c68e0 100644 --- a/src/libs/aggregation/aggregation_dependencies.pri +++ b/src/libs/aggregation/aggregation_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = Aggregation diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri deleted file mode 100644 index d17ace592ee..00000000000 --- a/src/libs/cplusplus/cplusplus.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(CPlusPlus) diff --git a/src/libs/cplusplus/cplusplus_dependencies.pri b/src/libs/cplusplus/cplusplus_dependencies.pri index 7b3d3dcf31f..0f89e4fabc4 100644 --- a/src/libs/cplusplus/cplusplus_dependencies.pri +++ b/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 diff --git a/src/libs/extensionsystem/extensionsystem.pri b/src/libs/extensionsystem/extensionsystem.pri deleted file mode 100644 index 4c7641b9cb4..00000000000 --- a/src/libs/extensionsystem/extensionsystem.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(extensionsystem_dependencies.pri) - -LIBS *= -l$$qtLibraryName(ExtensionSystem) diff --git a/src/libs/extensionsystem/extensionsystem_dependencies.pri b/src/libs/extensionsystem/extensionsystem_dependencies.pri index 63b2e339a36..1bbf1de4ec2 100644 --- a/src/libs/extensionsystem/extensionsystem_dependencies.pri +++ b/src/libs/extensionsystem/extensionsystem_dependencies.pri @@ -1 +1,3 @@ -include(../aggregation/aggregation.pri) +QTC_LIB_NAME = ExtensionSystem +QTC_LIB_DEPENDS += \ + aggregation diff --git a/src/libs/glsl/glsl.pri b/src/libs/glsl/glsl.pri deleted file mode 100644 index b6de9eab22f..00000000000 --- a/src/libs/glsl/glsl.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(GLSL) diff --git a/src/libs/glsl/glsl_dependencies.pri b/src/libs/glsl/glsl_dependencies.pri index 5e1db77cc93..8615ff67f49 100644 --- a/src/libs/glsl/glsl_dependencies.pri +++ b/src/libs/glsl/glsl_dependencies.pri @@ -1 +1,3 @@ -include(../utils/utils.pri) +QTC_LIB_NAME = GLSL +QTC_LIB_DEPENDS += \ + utils diff --git a/src/libs/languageutils/languageutils.pri b/src/libs/languageutils/languageutils.pri deleted file mode 100644 index 9709183d853..00000000000 --- a/src/libs/languageutils/languageutils.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(LanguageUtils) diff --git a/src/libs/languageutils/languageutils_dependencies.pri b/src/libs/languageutils/languageutils_dependencies.pri index 5e1db77cc93..3402e82d437 100644 --- a/src/libs/languageutils/languageutils_dependencies.pri +++ b/src/libs/languageutils/languageutils_dependencies.pri @@ -1 +1,3 @@ -include(../utils/utils.pri) +QTC_LIB_NAME = LanguageUtils +QTC_LIB_DEPENDS += \ + utils diff --git a/src/libs/qmldebug/qmldebug.pri b/src/libs/qmldebug/qmldebug.pri deleted file mode 100644 index c2b270a3566..00000000000 --- a/src/libs/qmldebug/qmldebug.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(QmlDebug) diff --git a/src/libs/qmldebug/qmldebug_dependencies.pri b/src/libs/qmldebug/qmldebug_dependencies.pri index e69de29bb2d..a99b82c4efe 100644 --- a/src/libs/qmldebug/qmldebug_dependencies.pri +++ b/src/libs/qmldebug/qmldebug_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = QmlDebug diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pri b/src/libs/qmleditorwidgets/qmleditorwidgets.pri deleted file mode 100644 index ed951d503fc..00000000000 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(QmlEditorWidgets) diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri b/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri index 225c3daa0f3..7768fffce83 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri +++ b/src/libs/qmleditorwidgets/qmleditorwidgets_dependencies.pri @@ -1,3 +1,5 @@ -include(../qmljs/qmljs.pri) -include(../utils/utils.pri) +QTC_LIB_NAME = QmlEditorWidgets +QTC_LIB_DEPENDS += \ + qmljs \ + utils QT *= declarative diff --git a/src/libs/qmljs/qmljs.pri b/src/libs/qmljs/qmljs.pri deleted file mode 100644 index 3cd320f3f60..00000000000 --- a/src/libs/qmljs/qmljs.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(QmlJS) diff --git a/src/libs/qmljs/qmljs_dependencies.pri b/src/libs/qmljs/qmljs_dependencies.pri index 6a261f76ef0..e1d1204148c 100644 --- a/src/libs/qmljs/qmljs_dependencies.pri +++ b/src/libs/qmljs/qmljs_dependencies.pri @@ -1,2 +1,4 @@ -include(../utils/utils.pri) -include(../languageutils/languageutils.pri) +QTC_LIB_NAME = QmlJS +QTC_LIB_DEPENDS += \ + utils \ + languageutils diff --git a/src/libs/ssh/ssh.pri b/src/libs/ssh/ssh.pri deleted file mode 100644 index fe58b81cba5..00000000000 --- a/src/libs/ssh/ssh.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(ssh_dependencies.pri) -LIBS *= -l$$qtLibraryName(QtcSsh) diff --git a/src/libs/ssh/ssh_dependencies.pri b/src/libs/ssh/ssh_dependencies.pri index e69de29bb2d..ccd896a82cb 100644 --- a/src/libs/ssh/ssh_dependencies.pri +++ b/src/libs/ssh/ssh_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = QtcSsh diff --git a/src/libs/utils/utils.pri b/src/libs/utils/utils.pri deleted file mode 100644 index 414ef2bd868..00000000000 --- a/src/libs/utils/utils.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(utils_dependencies.pri) -LIBS *= -l$$qtLibraryName(Utils) diff --git a/src/libs/utils/utils_dependencies.pri b/src/libs/utils/utils_dependencies.pri index e69de29bb2d..4a18a7f018f 100644 --- a/src/libs/utils/utils_dependencies.pri +++ b/src/libs/utils/utils_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = Utils diff --git a/src/libs/zeroconf/zeroconf.pri b/src/libs/zeroconf/zeroconf.pri deleted file mode 100644 index cf247ffeaca..00000000000 --- a/src/libs/zeroconf/zeroconf.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(zeroconf) diff --git a/src/libs/zeroconf/zeroconf_dependencies.pri b/src/libs/zeroconf/zeroconf_dependencies.pri index e69de29bb2d..9e8d0ea9bc9 100644 --- a/src/libs/zeroconf/zeroconf_dependencies.pri +++ b/src/libs/zeroconf/zeroconf_dependencies.pri @@ -0,0 +1 @@ +QTC_LIB_NAME = zeroconf diff --git a/src/plugins/analyzerbase/analyzerbase.pri b/src/plugins/analyzerbase/analyzerbase.pri deleted file mode 100644 index bd7886d8725..00000000000 --- a/src/plugins/analyzerbase/analyzerbase.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(analyzerbase_dependencies.pri) - -LIBS *= -l$$qtLibraryName(AnalyzerBase) diff --git a/src/plugins/analyzerbase/analyzerbase_dependencies.pri b/src/plugins/analyzerbase/analyzerbase_dependencies.pri index 8ac7abd3875..6079b07f16a 100644 --- a/src/plugins/analyzerbase/analyzerbase_dependencies.pri +++ b/src/plugins/analyzerbase/analyzerbase_dependencies.pri @@ -1,5 +1,8 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../libs/cplusplus/cplusplus.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/remotelinux/remotelinux.pri) -include(../../plugins/cpptools/cpptools.pri) +QTC_PLUGIN_NAME = AnalyzerBase +QTC_LIB_DEPENDS += \ + cplusplus +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + projectexplorer \ + remotelinux \ + cpptools diff --git a/src/plugins/android/android.pri b/src/plugins/android/android.pri deleted file mode 100644 index ca008aba34b..00000000000 --- a/src/plugins/android/android.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(android_dependencies.pri) - -LIBS *= -l$$qtLibraryName(Android) diff --git a/src/plugins/android/android_dependencies.pri b/src/plugins/android/android_dependencies.pri index c2940f93623..c5604f5bbae 100644 --- a/src/plugins/android/android_dependencies.pri +++ b/src/plugins/android/android_dependencies.pri @@ -1,4 +1,6 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/debugger/debugger.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/qt4projectmanager/qt4projectmanager.pri) +QTC_PLUGIN_NAME = Android +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + debugger \ + projectexplorer \ + qt4projectmanager diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri index 774680fda47..af5484d1db5 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri @@ -1,4 +1,6 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../plugins/qtsupport/qtsupport.pri) +QTC_PLUGIN_NAME = AutotoolsProjectManager +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + coreplugin \ + cpptools \ + qtsupport diff --git a/src/plugins/bazaar/bazaar_dependencies.pri b/src/plugins/bazaar/bazaar_dependencies.pri index 9e7c28e9e1a..a964c2be0e9 100644 --- a/src/plugins/bazaar/bazaar_dependencies.pri +++ b/src/plugins/bazaar/bazaar_dependencies.pri @@ -1,5 +1,8 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/vcsbase/vcsbase.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = Bazaar +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + texteditor \ + coreplugin \ + vcsbase diff --git a/src/plugins/bineditor/bineditor_dependencies.pri b/src/plugins/bineditor/bineditor_dependencies.pri index b25886164cd..825c980e927 100644 --- a/src/plugins/bineditor/bineditor_dependencies.pri +++ b/src/plugins/bineditor/bineditor_dependencies.pri @@ -1,3 +1,6 @@ -include(../../libs/utils/utils.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) +QTC_PLUGIN_NAME = BinEditor +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + texteditor \ + coreplugin diff --git a/src/plugins/bookmarks/bookmarks_dependencies.pri b/src/plugins/bookmarks/bookmarks_dependencies.pri index 92dde177ac2..faeb9015ced 100644 --- a/src/plugins/bookmarks/bookmarks_dependencies.pri +++ b/src/plugins/bookmarks/bookmarks_dependencies.pri @@ -1,3 +1,5 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/texteditor/texteditor.pri) +QTC_PLUGIN_NAME = Bookmarks +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + coreplugin \ + texteditor diff --git a/src/plugins/classview/classview_dependencies.pri b/src/plugins/classview/classview_dependencies.pri index b130241048a..4aa3b0527be 100644 --- a/src/plugins/classview/classview_dependencies.pri +++ b/src/plugins/classview/classview_dependencies.pri @@ -1,5 +1,8 @@ -include(../../libs/utils/utils.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) +QTC_PLUGIN_NAME = ClassView +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + cpptools \ + projectexplorer \ + texteditor diff --git a/src/plugins/clearcase/clearcase_dependencies.pri b/src/plugins/clearcase/clearcase_dependencies.pri index 9e7c28e9e1a..52d7309af5c 100644 --- a/src/plugins/clearcase/clearcase_dependencies.pri +++ b/src/plugins/clearcase/clearcase_dependencies.pri @@ -1,5 +1,8 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/vcsbase/vcsbase.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = ClearCase +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + texteditor \ + coreplugin \ + vcsbase diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri index 03f29efcdb1..002c7509614 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri @@ -1,4 +1,6 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/qtsupport/qtsupport.pri) +QTC_PLUGIN_NAME = CMakeProjectManager +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + cpptools \ + texteditor \ + qtsupport diff --git a/src/plugins/coreplugin/coreplugin.pri b/src/plugins/coreplugin/coreplugin.pri deleted file mode 100644 index 26143cbc129..00000000000 --- a/src/plugins/coreplugin/coreplugin.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(coreplugin_dependencies.pri) -LIBS *= -l$$qtLibraryName(Core) diff --git a/src/plugins/coreplugin/coreplugin_dependencies.pri b/src/plugins/coreplugin/coreplugin_dependencies.pri index 8b548e71796..a9741e10ebc 100644 --- a/src/plugins/coreplugin/coreplugin_dependencies.pri +++ b/src/plugins/coreplugin/coreplugin_dependencies.pri @@ -1,2 +1,4 @@ -include(../../libs/extensionsystem/extensionsystem.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = Core +QTC_LIB_DEPENDS += \ + extensionsystem \ + utils diff --git a/src/plugins/cpaster/cpaster_dependencies.pri b/src/plugins/cpaster/cpaster_dependencies.pri index ec55414dcf1..0b5e4890db9 100644 --- a/src/plugins/cpaster/cpaster_dependencies.pri +++ b/src/plugins/cpaster/cpaster_dependencies.pri @@ -1,2 +1,4 @@ -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) +QTC_PLUGIN_NAME = CodePaster +QTC_PLUGIN_DEPENDS += \ + texteditor \ + coreplugin diff --git a/src/plugins/cpaster/frontend/frontend.pro b/src/plugins/cpaster/frontend/frontend.pro index d1bcce11a19..8888cacdf94 100644 --- a/src/plugins/cpaster/frontend/frontend.pro +++ b/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 diff --git a/src/plugins/cppeditor/cppeditor.pri b/src/plugins/cppeditor/cppeditor.pri deleted file mode 100644 index e3f320ef004..00000000000 --- a/src/plugins/cppeditor/cppeditor.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(cppeditor_dependencies.pri) - -LIBS *= -l$$qtLibraryName(CppEditor) diff --git a/src/plugins/cppeditor/cppeditor_dependencies.pri b/src/plugins/cppeditor/cppeditor_dependencies.pri index e3bd5eb5883..a799ff93173 100644 --- a/src/plugins/cppeditor/cppeditor_dependencies.pri +++ b/src/plugins/cppeditor/cppeditor_dependencies.pri @@ -1,5 +1,8 @@ -include(../../libs/utils/utils.pri) -include(../../libs/cplusplus/cplusplus.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/cpptools/cpptools.pri) +QTC_PLUGIN_NAME = CppEditor +QTC_LIB_DEPENDS += \ + utils \ + cplusplus +QTC_PLUGIN_DEPENDS += \ + texteditor \ + coreplugin \ + cpptools diff --git a/src/plugins/cpptools/cpptools.pri b/src/plugins/cpptools/cpptools.pri deleted file mode 100644 index 5732e896e70..00000000000 --- a/src/plugins/cpptools/cpptools.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(cpptools_dependencies.pri) - -LIBS *= -l$$qtLibraryName(CppTools) diff --git a/src/plugins/cpptools/cpptools_dependencies.pri b/src/plugins/cpptools/cpptools_dependencies.pri index 885ca8adcac..b93363db2af 100644 --- a/src/plugins/cpptools/cpptools_dependencies.pri +++ b/src/plugins/cpptools/cpptools_dependencies.pri @@ -1,6 +1,9 @@ -include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri) -include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) -include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri) -include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri) -include($$IDE_SOURCE_TREE/src/plugins/locator/locator.pri) -include($$IDE_SOURCE_TREE/src/plugins/find/find.pri) +QTC_PLUGIN_NAME = CppTools +QTC_LIB_DEPENDS += \ + languageutils \ + cplusplus +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + texteditor \ + locator \ + find diff --git a/src/plugins/cvs/cvs_dependencies.pri b/src/plugins/cvs/cvs_dependencies.pri index 9e7c28e9e1a..612bc3dda14 100644 --- a/src/plugins/cvs/cvs_dependencies.pri +++ b/src/plugins/cvs/cvs_dependencies.pri @@ -1,5 +1,8 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/vcsbase/vcsbase.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = CVS +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + texteditor \ + coreplugin \ + vcsbase diff --git a/src/plugins/debugger/debugger.pri b/src/plugins/debugger/debugger.pri deleted file mode 100644 index aff224a83dd..00000000000 --- a/src/plugins/debugger/debugger.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(debugger_dependencies.pri) - -LIBS *= -l$$qtLibraryName(Debugger) diff --git a/src/plugins/debugger/debugger_dependencies.pri b/src/plugins/debugger/debugger_dependencies.pri index c5b5e44500a..1ca1fcf5511 100644 --- a/src/plugins/debugger/debugger_dependencies.pri +++ b/src/plugins/debugger/debugger_dependencies.pri @@ -1,10 +1,13 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../plugins/find/find.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../libs/cplusplus/cplusplus.pri) -include(../../libs/utils/utils.pri) -include(../../libs/qmljs/qmljs.pri) -include(../../libs/qmldebug/qmldebug.pri) -include(../../libs/ssh/ssh.pri) +QTC_PLUGIN_NAME = Debugger +QTC_LIB_DEPENDS += \ + cplusplus \ + utils \ + qmldebug \ + qmljs \ + ssh +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + cpptools \ + find \ + projectexplorer \ + texteditor diff --git a/src/plugins/designer/designer.pri b/src/plugins/designer/designer.pri deleted file mode 100644 index 829605d75e7..00000000000 --- a/src/plugins/designer/designer.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(designer_dependencies.pri) - -LIBS *= -l$$qtLibraryName(Designer) diff --git a/src/plugins/designer/designer_dependencies.pri b/src/plugins/designer/designer_dependencies.pri index f19342ea3ca..417689ea9ff 100644 --- a/src/plugins/designer/designer_dependencies.pri +++ b/src/plugins/designer/designer_dependencies.pri @@ -1,5 +1,8 @@ -include(../../libs/cplusplus/cplusplus.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../libs/utils/utils.pri) -include(../../plugins/coreplugin/coreplugin.pri) +QTC_PLUGIN_NAME = Designer +QTC_LIB_DEPENDS += \ + cplusplus \ + utils +QTC_PLUGIN_DEPENDS += \ + cpptools \ + texteditor \ + coreplugin diff --git a/src/plugins/diffeditor/diffeditor.pri b/src/plugins/diffeditor/diffeditor.pri deleted file mode 100644 index 496feda611a..00000000000 --- a/src/plugins/diffeditor/diffeditor.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(diffeditor_dependencies.pri) - -LIBS *= -l$$qtLibraryName(DiffEditor) diff --git a/src/plugins/diffeditor/diffeditor_dependencies.pri b/src/plugins/diffeditor/diffeditor_dependencies.pri index b25886164cd..c47a77c9843 100644 --- a/src/plugins/diffeditor/diffeditor_dependencies.pri +++ b/src/plugins/diffeditor/diffeditor_dependencies.pri @@ -1,3 +1,6 @@ -include(../../libs/utils/utils.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) +QTC_PLUGIN_NAME = DiffEditor +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + texteditor \ + coreplugin diff --git a/src/plugins/fakevim/fakevim_dependencies.pri b/src/plugins/fakevim/fakevim_dependencies.pri index c9b4d94f272..abb8f31a74a 100644 --- a/src/plugins/fakevim/fakevim_dependencies.pri +++ b/src/plugins/fakevim/fakevim_dependencies.pri @@ -1,3 +1,5 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/find/find.pri) +QTC_PLUGIN_NAME = FakeVim +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + texteditor \ + find diff --git a/src/plugins/find/find.pri b/src/plugins/find/find.pri deleted file mode 100644 index 5ab55ec4342..00000000000 --- a/src/plugins/find/find.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(find_dependencies.pri) - -LIBS *= -l$$qtLibraryName(Find) diff --git a/src/plugins/find/find_dependencies.pri b/src/plugins/find/find_dependencies.pri index 7f369f6326a..52291a8aab4 100644 --- a/src/plugins/find/find_dependencies.pri +++ b/src/plugins/find/find_dependencies.pri @@ -1,2 +1,5 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = Find +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + coreplugin diff --git a/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri b/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri index 03f29efcdb1..224aece4bd1 100644 --- a/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri +++ b/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri @@ -1,4 +1,6 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/qtsupport/qtsupport.pri) +QTC_PLUGIN_NAME = GenericProjectManager +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + cpptools \ + texteditor \ + qtsupport diff --git a/src/plugins/git/git_dependencies.pri b/src/plugins/git/git_dependencies.pri index 9e7c28e9e1a..fccc00210e0 100644 --- a/src/plugins/git/git_dependencies.pri +++ b/src/plugins/git/git_dependencies.pri @@ -1,5 +1,8 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/vcsbase/vcsbase.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = Git +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + texteditor \ + coreplugin \ + vcsbase diff --git a/src/plugins/glsleditor/glsleditor.pri b/src/plugins/glsleditor/glsleditor.pri deleted file mode 100644 index aac9022e3e5..00000000000 --- a/src/plugins/glsleditor/glsleditor.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(qmljseditor_dependencies.pri) - -LIBS *= -l$$qtLibraryName(QmlJSEditor) diff --git a/src/plugins/glsleditor/glsleditor_dependencies.pri b/src/plugins/glsleditor/glsleditor_dependencies.pri index 163216eac4f..073940cd73c 100644 --- a/src/plugins/glsleditor/glsleditor_dependencies.pri +++ b/src/plugins/glsleditor/glsleditor_dependencies.pri @@ -1,7 +1,10 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../libs/glsl/glsl.pri) -include(../../libs/utils/utils.pri) -include(../../libs/cplusplus/cplusplus.pri) +QTC_PLUGIN_NAME = GLSLEditor +QTC_LIB_DEPENDS += \ + glsl \ + utils \ + cplusplus +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + texteditor \ + projectexplorer \ + cpptools diff --git a/src/plugins/helloworld/helloworld_dependencies.pri b/src/plugins/helloworld/helloworld_dependencies.pri index a64caedc103..014c78108b2 100644 --- a/src/plugins/helloworld/helloworld_dependencies.pri +++ b/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 diff --git a/src/plugins/help/help.pri b/src/plugins/help/help.pri deleted file mode 100644 index cea3ed71f9d..00000000000 --- a/src/plugins/help/help.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(help_dependencies.pri) - -LIBS *= -l$$qtLibraryTarget(Help) diff --git a/src/plugins/help/help_dependencies.pri b/src/plugins/help/help_dependencies.pri index 1d3fd6128c3..058256c5790 100644 --- a/src/plugins/help/help_dependencies.pri +++ b/src/plugins/help/help_dependencies.pri @@ -1,4 +1,5 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/find/find.pri) -include(../../plugins/locator/locator.pri) - +QTC_PLUGIN_NAME = Help +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + find \ + locator diff --git a/src/plugins/imageviewer/imageviewer_dependencies.pri b/src/plugins/imageviewer/imageviewer_dependencies.pri index 56b1dff3523..58a962f6464 100644 --- a/src/plugins/imageviewer/imageviewer_dependencies.pri +++ b/src/plugins/imageviewer/imageviewer_dependencies.pri @@ -1,2 +1,5 @@ -include(../../libs/utils/utils.pri) -include(../../plugins/coreplugin/coreplugin.pri) +QTC_PLUGIN_NAME = ImageViewer +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + coreplugin diff --git a/src/plugins/locator/locator.pri b/src/plugins/locator/locator.pri deleted file mode 100644 index 541771da514..00000000000 --- a/src/plugins/locator/locator.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(locator_dependencies.pri) - -LIBS *= -l$$qtLibraryName(Locator) diff --git a/src/plugins/locator/locator_dependencies.pri b/src/plugins/locator/locator_dependencies.pri index a64caedc103..899b5554a6c 100644 --- a/src/plugins/locator/locator_dependencies.pri +++ b/src/plugins/locator/locator_dependencies.pri @@ -1 +1,3 @@ -include(../../plugins/coreplugin/coreplugin.pri) +QTC_PLUGIN_NAME = Locator +QTC_PLUGIN_DEPENDS += \ + coreplugin diff --git a/src/plugins/macros/macros.pri b/src/plugins/macros/macros.pri deleted file mode 100644 index e896cd943bc..00000000000 --- a/src/plugins/macros/macros.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(macros_dependencies.pri) - -LIBS *= -l$$qtLibraryTarget(Macros) diff --git a/src/plugins/macros/macros_dependencies.pri b/src/plugins/macros/macros_dependencies.pri index 48ed0123081..3ae94328b31 100644 --- a/src/plugins/macros/macros_dependencies.pri +++ b/src/plugins/macros/macros_dependencies.pri @@ -1,4 +1,6 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/locator/locator.pri) -include(../../plugins/find/find.pri) -include(../../plugins/texteditor/texteditor.pri) +QTC_PLUGIN_NAME = Macros +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + locator \ + find \ + texteditor diff --git a/src/plugins/madde/madde.pri b/src/plugins/madde/madde.pri deleted file mode 100644 index 90a62b71b85..00000000000 --- a/src/plugins/madde/madde.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(madde_dependencies.pri) - -LIBS *= -l$$qtLibraryName(Madde) diff --git a/src/plugins/madde/madde_dependencies.pri b/src/plugins/madde/madde_dependencies.pri index 630796bcbf7..c5affe494d5 100644 --- a/src/plugins/madde/madde_dependencies.pri +++ b/src/plugins/madde/madde_dependencies.pri @@ -1,2 +1,4 @@ -include(../../plugins/qt4projectmanager/qt4projectmanager.pri) -include(../../plugins/remotelinux/remotelinux.pri) +QTC_PLUGIN_NAME = Madde +QTC_PLUGIN_DEPENDS += \ + qt4projectmanager \ + remotelinux diff --git a/src/plugins/mercurial/mercurial_dependencies.pri b/src/plugins/mercurial/mercurial_dependencies.pri index 9e7c28e9e1a..3f3428c747c 100644 --- a/src/plugins/mercurial/mercurial_dependencies.pri +++ b/src/plugins/mercurial/mercurial_dependencies.pri @@ -1,5 +1,8 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/vcsbase/vcsbase.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = Mercurial +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + texteditor \ + coreplugin \ + vcsbase diff --git a/src/plugins/perforce/perforce_dependencies.pri b/src/plugins/perforce/perforce_dependencies.pri index 9e7c28e9e1a..8769ff4e342 100644 --- a/src/plugins/perforce/perforce_dependencies.pri +++ b/src/plugins/perforce/perforce_dependencies.pri @@ -1,5 +1,8 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/vcsbase/vcsbase.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = Perforce +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + texteditor \ + coreplugin \ + vcsbase diff --git a/src/plugins/projectexplorer/projectexplorer.pri b/src/plugins/projectexplorer/projectexplorer.pri deleted file mode 100644 index 8b464277e4e..00000000000 --- a/src/plugins/projectexplorer/projectexplorer.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(projectexplorer_dependencies.pri) -LIBS *= -l$$qtLibraryName(ProjectExplorer) diff --git a/src/plugins/projectexplorer/projectexplorer_dependencies.pri b/src/plugins/projectexplorer/projectexplorer_dependencies.pri index ee082b74ba6..f970e87607c 100644 --- a/src/plugins/projectexplorer/projectexplorer_dependencies.pri +++ b/src/plugins/projectexplorer/projectexplorer_dependencies.pri @@ -1,7 +1,10 @@ -include(../../libs/utils/utils.pri) -include(../../libs/ssh/ssh.pri) -include(../../plugins/locator/locator.pri) -include(../../plugins/find/find.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/texteditor/texteditor.pri) +QTC_PLUGIN_NAME = ProjectExplorer +QTC_LIB_DEPENDS += \ + ssh \ + utils +QTC_PLUGIN_DEPENDS += \ + locator \ + find \ + coreplugin \ + texteditor QT *= network diff --git a/src/plugins/pythoneditor/pythoneditor_dependencies.pri b/src/plugins/pythoneditor/pythoneditor_dependencies.pri index 5ba8828dcf5..2988622acc1 100644 --- a/src/plugins/pythoneditor/pythoneditor_dependencies.pri +++ b/src/plugins/pythoneditor/pythoneditor_dependencies.pri @@ -1,3 +1,5 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/cpptools/cpptools.pri) +QTC_PLUGIN_NAME = PythonEditor +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + texteditor \ + cpptools diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri b/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri index 35151814588..b0e4f4021fa 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri @@ -1,5 +1,7 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/qtsupport/qtsupport.pri) -include(../../plugins/qmljstools/qmljstools.pri) +QTC_PLUGIN_NAME = QbsProjectManager +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + cpptools \ + texteditor \ + qtsupport \ + qmljstools diff --git a/src/plugins/qmldesigner/qmldesigner.pri b/src/plugins/qmldesigner/qmldesigner.pri deleted file mode 100644 index 4be19eb995e..00000000000 --- a/src/plugins/qmldesigner/qmldesigner.pri +++ /dev/null @@ -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 diff --git a/src/plugins/qmldesigner/qmldesigner_dependencies.pri b/src/plugins/qmldesigner/qmldesigner_dependencies.pri index 52e2603a22d..c96503ba2cf 100644 --- a/src/plugins/qmldesigner/qmldesigner_dependencies.pri +++ b/src/plugins/qmldesigner/qmldesigner_dependencies.pri @@ -1,9 +1,12 @@ -include(../../libs/utils/utils.pri) -include(../../libs/qmljs/qmljs.pri) -include(../../libs/qmleditorwidgets/qmleditorwidgets.pri) -include(../coreplugin/coreplugin.pri) -include(../texteditor/texteditor.pri) -include(../qmljseditor/qmljseditor.pri) -include(../qt4projectmanager/qt4projectmanager.pri) -include(../qmlprojectmanager/qmlprojectmanager.pri) -include(../projectexplorer/projectexplorer.pri) +QTC_PLUGIN_NAME = QmlDesigner +QTC_LIB_DEPENDS += \ + utils \ + qmljs \ + qmleditorwidgets +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + texteditor \ + qmljseditor \ + qt4projectmanager \ + qmlprojectmanager \ + projectexplorer diff --git a/src/plugins/qmljseditor/qmljseditor.pri b/src/plugins/qmljseditor/qmljseditor.pri deleted file mode 100644 index aac9022e3e5..00000000000 --- a/src/plugins/qmljseditor/qmljseditor.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(qmljseditor_dependencies.pri) - -LIBS *= -l$$qtLibraryName(QmlJSEditor) diff --git a/src/plugins/qmljseditor/qmljseditor_dependencies.pri b/src/plugins/qmljseditor/qmljseditor_dependencies.pri index 5634e49ad4d..56134f03348 100644 --- a/src/plugins/qmljseditor/qmljseditor_dependencies.pri +++ b/src/plugins/qmljseditor/qmljseditor_dependencies.pri @@ -1,6 +1,9 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/qmljstools/qmljstools.pri) -include(../../libs/utils/utils.pri) -include(../../libs/qmleditorwidgets/qmleditorwidgets.pri) +QTC_PLUGIN_NAME = QmlJSEditor +QTC_LIB_DEPENDS += \ + utils \ + qmleditorwidgets +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + texteditor \ + projectexplorer \ + qmljstools diff --git a/src/plugins/qmljstools/qmljstools.pri b/src/plugins/qmljstools/qmljstools.pri deleted file mode 100644 index 1d36f5e4061..00000000000 --- a/src/plugins/qmljstools/qmljstools.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(qmljstools_dependencies.pri) - -LIBS *= -l$$qtLibraryName(QmlJSTools) diff --git a/src/plugins/qmljstools/qmljstools_dependencies.pri b/src/plugins/qmljstools/qmljstools_dependencies.pri index fe173668db5..fec65a83be4 100644 --- a/src/plugins/qmljstools/qmljstools_dependencies.pri +++ b/src/plugins/qmljstools/qmljstools_dependencies.pri @@ -1,7 +1,10 @@ -include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri) -include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) -include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri) -include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri) -include($$IDE_SOURCE_TREE/src/plugins/qtsupport/qtsupport.pri) -include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri) -include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri) +QTC_PLUGIN_NAME = QmlJSTools +QTC_LIB_DEPENDS += \ + languageutils \ + cplusplus \ + qmljs +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + qtsupport \ + texteditor \ + cpptools diff --git a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri index 1ff4d65f58c..18371ae3f3c 100644 --- a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri +++ b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri @@ -1,8 +1,11 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/analyzerbase/analyzerbase.pri) -include(../../plugins/qmlprojectmanager/qmlprojectmanager.pri) -include(../../plugins/qt4projectmanager/qt4projectmanager.pri) -include(../../plugins/qmljstools/qmljstools.pri) -include(../../plugins/remotelinux/remotelinux.pri) -include(../../libs/qmldebug/qmldebug.pri) -include(../../libs/extensionsystem/extensionsystem.pri) +QTC_PLUGIN_NAME = QmlProfiler +QTC_LIB_DEPENDS += \ + qmldebug \ + extensionsystem +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + analyzerbase \ + qmlprojectmanager \ + qt4projectmanager \ + qmljstools \ + remotelinux diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pri b/src/plugins/qmlprojectmanager/qmlprojectmanager.pri deleted file mode 100644 index 948a5f9cc64..00000000000 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(qmlprojectmanager_dependencies.pri) -LIBS *= -l$$qtLibraryName(QmlProjectManager) diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri index 397018b9103..26bb7e215f3 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri @@ -1,6 +1,8 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/qmljseditor/qmljseditor.pri) -include(../../plugins/qmljstools/qmljstools.pri) -include(../../plugins/debugger/debugger.pri) -include(../../plugins/qtsupport/qtsupport.pri) +QTC_PLUGIN_NAME = QmlProjectManager +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + texteditor \ + qmljseditor \ + qmljstools \ + debugger \ + qtsupport diff --git a/src/plugins/qnx/qnx_dependencies.pri b/src/plugins/qnx/qnx_dependencies.pri index 7ad421acfa8..e1019e0b920 100644 --- a/src/plugins/qnx/qnx_dependencies.pri +++ b/src/plugins/qnx/qnx_dependencies.pri @@ -1,4 +1,6 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/qt4projectmanager/qt4projectmanager.pri) -include(../../plugins/remotelinux/remotelinux.pri) -include(../../plugins/texteditor/texteditor.pri) +QTC_PLUGIN_NAME = Qnx +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + qt4projectmanager \ + remotelinux \ + texteditor diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pri b/src/plugins/qt4projectmanager/qt4projectmanager.pri deleted file mode 100644 index d3f03488b5f..00000000000 --- a/src/plugins/qt4projectmanager/qt4projectmanager.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(qt4projectmanager_dependencies.pri) - -LIBS *= -l$$qtLibraryName(Qt4ProjectManager) diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri index 35c58553abe..dcaa491ca8c 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri +++ b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri @@ -1,6 +1,9 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/qtsupport/qtsupport.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../plugins/debugger/debugger.pri) -include(../../libs/qmljs/qmljs.pri) -include(../../plugins/qmljstools/qmljstools.pri) +QTC_PLUGIN_NAME = Qt4ProjectManager +QTC_LIB_DEPENDS += \ + qmljs +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + qtsupport \ + cpptools \ + debugger \ + qmljstools diff --git a/src/plugins/qtsupport/qtsupport.pri b/src/plugins/qtsupport/qtsupport.pri deleted file mode 100644 index 6ab5e712ab2..00000000000 --- a/src/plugins/qtsupport/qtsupport.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(qtsupport_dependencies.pri) - -LIBS *= -l$$qtLibraryName(QtSupport) diff --git a/src/plugins/qtsupport/qtsupport_dependencies.pri b/src/plugins/qtsupport/qtsupport_dependencies.pri index 18d4ba93cf2..4cbf35cb2e5 100644 --- a/src/plugins/qtsupport/qtsupport_dependencies.pri +++ b/src/plugins/qtsupport/qtsupport_dependencies.pri @@ -1,6 +1,9 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../libs/qmljs/qmljs.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = QtSupport +QTC_LIB_DEPENDS += \ + qmljs \ + utils +QTC_PLUGIN_DEPENDS += \ + projectexplorer DEFINES *= \ QMAKE_AS_LIBRARY \ PROPARSER_THREAD_SAFE \ diff --git a/src/plugins/remotelinux/remotelinux.pri b/src/plugins/remotelinux/remotelinux.pri deleted file mode 100644 index cfae991f603..00000000000 --- a/src/plugins/remotelinux/remotelinux.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(remotelinux_dependencies.pri) - -LIBS *= -l$$qtLibraryName(RemoteLinux) diff --git a/src/plugins/remotelinux/remotelinux_dependencies.pri b/src/plugins/remotelinux/remotelinux_dependencies.pri index 697ec645a18..4027b3a12c4 100644 --- a/src/plugins/remotelinux/remotelinux_dependencies.pri +++ b/src/plugins/remotelinux/remotelinux_dependencies.pri @@ -1,4 +1,6 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/debugger/debugger.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/qtsupport/qtsupport.pri) +QTC_PLUGIN_NAME = RemoteLinux +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + debugger \ + projectexplorer \ + qtsupport diff --git a/src/plugins/resourceeditor/resourceeditor_dependencies.pri b/src/plugins/resourceeditor/resourceeditor_dependencies.pri index 327065696e3..753971d6dbe 100644 --- a/src/plugins/resourceeditor/resourceeditor_dependencies.pri +++ b/src/plugins/resourceeditor/resourceeditor_dependencies.pri @@ -1,3 +1,6 @@ -include(../../libs/utils/utils.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/find/find.pri) +QTC_PLUGIN_NAME = ResourceEditor +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + find diff --git a/src/plugins/subversion/subversion_dependencies.pri b/src/plugins/subversion/subversion_dependencies.pri index 9e7c28e9e1a..3caa1e28fa7 100644 --- a/src/plugins/subversion/subversion_dependencies.pri +++ b/src/plugins/subversion/subversion_dependencies.pri @@ -1,5 +1,8 @@ -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/vcsbase/vcsbase.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = Subversion +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + projectexplorer \ + texteditor \ + coreplugin \ + vcsbase diff --git a/src/plugins/tasklist/tasklist_dependencies.pri b/src/plugins/tasklist/tasklist_dependencies.pri index 1cba782765a..af8c39d7804 100644 --- a/src/plugins/tasklist/tasklist_dependencies.pri +++ b/src/plugins/tasklist/tasklist_dependencies.pri @@ -1,2 +1,4 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) +QTC_PLUGIN_NAME = TaskList +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + projectexplorer diff --git a/src/plugins/texteditor/texteditor.pri b/src/plugins/texteditor/texteditor.pri deleted file mode 100644 index c1c3e7a19ae..00000000000 --- a/src/plugins/texteditor/texteditor.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(texteditor_dependencies.pri) - -LIBS *= -l$$qtLibraryName(TextEditor) diff --git a/src/plugins/texteditor/texteditor_dependencies.pri b/src/plugins/texteditor/texteditor_dependencies.pri index 5012cea9ffe..0d4d168776e 100644 --- a/src/plugins/texteditor/texteditor_dependencies.pri +++ b/src/plugins/texteditor/texteditor_dependencies.pri @@ -1,4 +1,7 @@ -include(../../libs/utils/utils.pri) -include(../../plugins/find/find.pri) -include(../../plugins/locator/locator.pri) -include(../../plugins/coreplugin/coreplugin.pri) +QTC_PLUGIN_NAME = TextEditor +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + find \ + locator \ + coreplugin diff --git a/src/plugins/todo/todo_dependencies.pri b/src/plugins/todo/todo_dependencies.pri index ceda7201eca..e310abc5984 100644 --- a/src/plugins/todo/todo_dependencies.pri +++ b/src/plugins/todo/todo_dependencies.pri @@ -1,5 +1,8 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/cpptools/cpptools.pri) -include(../../libs/qmljs/qmljs.pri) +QTC_PLUGIN_NAME = Todo +QTC_LIB_DEPENDS += \ + qmljs +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + projectexplorer \ + texteditor \ + cpptools diff --git a/src/plugins/updateinfo/updateinfo_dependencies.pri b/src/plugins/updateinfo/updateinfo_dependencies.pri index 09a760d031a..2c4a97d0bda 100644 --- a/src/plugins/updateinfo/updateinfo_dependencies.pri +++ b/src/plugins/updateinfo/updateinfo_dependencies.pri @@ -1,2 +1,5 @@ -include(../../libs/extensionsystem/extensionsystem.pri) -include(../../plugins/coreplugin/coreplugin.pri) +QTC_PLUGIN_NAME = UpdateInfo +QTC_LIB_DEPENDS += \ + extensionsystem +QTC_PLUGIN_DEPENDS += \ + coreplugin diff --git a/src/plugins/valgrind/valgrind.pri b/src/plugins/valgrind/valgrind.pri deleted file mode 100644 index ac5883e6eba..00000000000 --- a/src/plugins/valgrind/valgrind.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(valgrind_dependencies.pri) - -LIBS *= -l$$qtLibraryName(Valgrind) diff --git a/src/plugins/valgrind/valgrind_dependencies.pri b/src/plugins/valgrind/valgrind_dependencies.pri index ea9b0abc94c..cd56d7ea297 100644 --- a/src/plugins/valgrind/valgrind_dependencies.pri +++ b/src/plugins/valgrind/valgrind_dependencies.pri @@ -1,6 +1,9 @@ -include(../../libs/cplusplus/cplusplus.pri) -include(../../plugins/analyzerbase/analyzerbase.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/remotelinux/remotelinux.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = Valgrind +QTC_LIB_DEPENDS += \ + cplusplus \ + utils +QTC_PLUGIN_DEPENDS += \ + analyzerbase \ + coreplugin \ + texteditor \ + remotelinux diff --git a/src/plugins/vcsbase/vcsbase.pri b/src/plugins/vcsbase/vcsbase.pri deleted file mode 100644 index 17708695d7f..00000000000 --- a/src/plugins/vcsbase/vcsbase.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(vcsbase_dependencies.pri) - -LIBS *= -l$$qtLibraryName(VcsBase) diff --git a/src/plugins/vcsbase/vcsbase_dependencies.pri b/src/plugins/vcsbase/vcsbase_dependencies.pri index 3f3f1c378f8..c089267094c 100644 --- a/src/plugins/vcsbase/vcsbase_dependencies.pri +++ b/src/plugins/vcsbase/vcsbase_dependencies.pri @@ -1,5 +1,7 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/find/find.pri) -include(../../plugins/cpptools/cpptools.pri) +QTC_PLUGIN_NAME = VcsBase +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + texteditor \ + projectexplorer \ + find \ + cpptools diff --git a/src/plugins/welcome/welcome.pri b/src/plugins/welcome/welcome.pri deleted file mode 100644 index 2edd8a4dfc6..00000000000 --- a/src/plugins/welcome/welcome.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(welcome_dependencies.pri) - -LIBS *= -l$$qtLibraryTarget(Welcome) diff --git a/src/plugins/welcome/welcome_dependencies.pri b/src/plugins/welcome/welcome_dependencies.pri index 7f369f6326a..61c1aa505b7 100644 --- a/src/plugins/welcome/welcome_dependencies.pri +++ b/src/plugins/welcome/welcome_dependencies.pri @@ -1,2 +1,5 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../libs/utils/utils.pri) +QTC_PLUGIN_NAME = Welcome +QTC_LIB_DEPENDS += \ + utils +QTC_PLUGIN_DEPENDS += \ + coreplugin diff --git a/src/qtcreatorlibrary.pri b/src/qtcreatorlibrary.pri index 2860c84c119..9184fd03d42 100644 --- a/src/qtcreatorlibrary.pri +++ b/src/qtcreatorlibrary.pri @@ -1,7 +1,7 @@ -include(../qtcreator.pri) - include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri)) +include(../qtcreator.pri) + # use precompiled header for libraries by default isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_pch.h diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index a5369fccab8..37b4c5778c0 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -1,7 +1,7 @@ -include(../qtcreator.pri) - include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri)) +include(../qtcreator.pri) + # use gui precompiled header for plugins by default isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_gui_pch.h diff --git a/src/tools/sdktool/sdktool.pro b/src/tools/sdktool/sdktool.pro index ea634465ffc..a49012be069 100644 --- a/src/tools/sdktool/sdktool.pro +++ b/src/tools/sdktool/sdktool.pro @@ -1,6 +1,8 @@ +QTC_LIB_DEPENDS += \ + utils + include(../../../qtcreator.pri) include(../../rpath.pri) -include(../../libs/utils/utils.pri) CONFIG += console CONFIG -= app_bundle diff --git a/tests/auto/aggregation/aggregation.pro b/tests/auto/aggregation/aggregation.pro index ceac55227b6..ac8753ae286 100644 --- a/tests/auto/aggregation/aggregation.pro +++ b/tests/auto/aggregation/aggregation.pro @@ -1,4 +1,4 @@ QT -= gui +QTC_LIB_DEPENDS += aggregation include(../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/aggregation/aggregation.pri) SOURCES += tst_aggregate.cpp diff --git a/tests/auto/changeset/changeset.pro b/tests/auto/changeset/changeset.pro index 19afe27926d..163327f81a5 100644 --- a/tests/auto/changeset/changeset.pro +++ b/tests/auto/changeset/changeset.pro @@ -1,5 +1,5 @@ +QTC_LIB_DEPENDS += utils + include(../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) - SOURCES += tst_changeset.cpp diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri index 9f84530427e..2dfc2bad2f9 100644 --- a/tests/auto/cplusplus/shared/shared.pri +++ b/tests/auto/cplusplus/shared/shared.pri @@ -1,6 +1,6 @@ +QTC_PLUGIN_DEPENDS += cpptools include(../../qttest.pri) DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB -include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri) include($$IDE_SOURCE_TREE/src/rpath.pri) LIBS += -L$$IDE_PLUGIN_PATH/QtProject diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro index acb4273d2b7..292368929a2 100644 --- a/tests/auto/debugger/dumpers.pro +++ b/tests/auto/debugger/dumpers.pro @@ -1,3 +1,4 @@ +QTC_PLUGIN_DEPENDS += cpptools include(../qttest.pri) @@ -6,7 +7,6 @@ DUMPERDIR = $$IDE_SOURCE_TREE/share/qtcreator/dumper # To access the std::type rewriter DEFINES += CPLUSPLUS_BUILD_STATIC_LIB -include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri) include($$IDE_SOURCE_TREE/src/rpath.pri) LIBS += -L$$IDE_PLUGIN_PATH/QtProject diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro index 8ba9dde886d..4ddc56d126b 100644 --- a/tests/auto/debugger/gdb.pro +++ b/tests/auto/debugger/gdb.pro @@ -1,5 +1,5 @@ +QTC_LIB_DEPENDS += utils include(../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger diff --git a/tests/auto/debugger/namedemangler.pro b/tests/auto/debugger/namedemangler.pro index da9dba3a30c..872cadc7fc9 100644 --- a/tests/auto/debugger/namedemangler.pro +++ b/tests/auto/debugger/namedemangler.pro @@ -1,3 +1,5 @@ +QTC_LIB_DEPENDS += utils + include(../qttest.pri) DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger @@ -5,5 +7,4 @@ INCLUDEPATH += $$DEBUGGERDIR SOURCES = tst_namedemangler.cpp include($$DEBUGGERDIR/namedemangler/namedemangler.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) diff --git a/tests/auto/diff/differ/differ.pro b/tests/auto/diff/differ/differ.pro index 1859dd30d99..9f00b4076c2 100644 --- a/tests/auto/diff/differ/differ.pro +++ b/tests/auto/diff/differ/differ.pro @@ -1,6 +1,6 @@ -include(../../qttest.pri) +QTC_PLUGIN_DEPENDS += diffeditor -include($$IDE_SOURCE_TREE/src/plugins/diffeditor/diffeditor.pri) +include(../../qttest.pri) LIBS += -L$$IDE_PLUGIN_PATH/QtProject diff --git a/tests/auto/environment/environment.pro b/tests/auto/environment/environment.pro index b1c78cc1219..eaa44620bda 100644 --- a/tests/auto/environment/environment.pro +++ b/tests/auto/environment/environment.pro @@ -1,4 +1,4 @@ +QTC_LIB_DEPENDS += utils include(../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) SOURCES += tst_environment.cpp diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro index 3cf7cd4286c..a7601021479 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro @@ -6,8 +6,8 @@ DEFINES += PLUGIN1_LIBRARY OTHER_FILES = $$PWD/plugin.xml +QTC_LIB_DEPENDS += extensionsystem include(../../../../../../qtcreator.pri) -include(../../../../../../src/libs/extensionsystem/extensionsystem.pri) include(../../../../qttestrpath.pri) COPYDIR = $$OUT_PWD diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro index 9a53b2ccfbe..51a01919be8 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro @@ -6,8 +6,8 @@ DEFINES += PLUGIN2_LIBRARY OTHER_FILES = $$PWD/plugin.xml +QTC_LIB_DEPENDS += extensionsystem include(../../../../../../qtcreator.pri) -include(../../../../../../src/libs/extensionsystem/extensionsystem.pri) include(../../../../qttestrpath.pri) COPYDIR = $$OUT_PWD diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro index 7739e7475ef..ea0861362db 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro @@ -6,8 +6,8 @@ DEFINES += PLUGIN3_LIBRARY OTHER_FILES = $$PWD/plugin.xml +QTC_LIB_DEPENDS += extensionsystem include(../../../../../../qtcreator.pri) -include(../../../../../../src/libs/extensionsystem/extensionsystem.pri) include(../../../../qttestrpath.pri) COPYDIR = $$OUT_PWD diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro index aa16fb809bb..5c48e5c3050 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro @@ -6,8 +6,8 @@ DEFINES += PLUGIN1_LIBRARY OTHER_FILES = $$PWD/plugin.spec +QTC_LIB_DEPENDS += extensionsystem include(../../../../qttest.pri) -include(../../../../../../src/libs/extensionsystem/extensionsystem.pri) COPYDIR = $$OUT_PWD COPYFILES = $$OTHER_FILES diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro index 9a398e95c17..181407e76e2 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro @@ -6,8 +6,8 @@ DEFINES += PLUGIN2_LIBRARY OTHER_FILES = $$PWD/plugin.spec +QTC_LIB_DEPENDS += extensionsystem include(../../../../qttest.pri) -include(../../../../../../src/libs/extensionsystem/extensionsystem.pri) COPYDIR = $$OUT_PWD COPYFILES = $$OTHER_FILES diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro index 05f938f8591..8317fcecb25 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro @@ -6,8 +6,8 @@ DEFINES += PLUGIN3_LIBRARY OTHER_FILES = $$PWD/plugin.spec +QTC_LIB_DEPENDS += extensionsystem include(../../../../qttest.pri) -include(../../../../../../src/libs/extensionsystem/extensionsystem.pri) COPYDIR = $$OUT_PWD COPYFILES = $$OTHER_FILES diff --git a/tests/auto/extensionsystem/pluginmanager/test.pro b/tests/auto/extensionsystem/pluginmanager/test.pro index 06421f233a0..b0ef1c56a4d 100644 --- a/tests/auto/extensionsystem/pluginmanager/test.pro +++ b/tests/auto/extensionsystem/pluginmanager/test.pro @@ -2,8 +2,8 @@ TARGET = pluginmanager # Input +QTC_LIB_DEPENDS += extensionsystem include(../../qttest.pri) -include(../../../../src/libs/extensionsystem/extensionsystem.pri) SOURCES += tst_pluginmanager.cpp diff --git a/tests/auto/extensionsystem/pluginspec/test.pro b/tests/auto/extensionsystem/pluginspec/test.pro index 5a3c2ca3aa9..aa82b3d9218 100644 --- a/tests/auto/extensionsystem/pluginspec/test.pro +++ b/tests/auto/extensionsystem/pluginspec/test.pro @@ -20,8 +20,8 @@ OTHER_FILES += \ $$PWD/testdependencies/spec5.xml \ $$PWD/testdir/spec.xml +QTC_LIB_DEPENDS += extensionsystem include(../../qttest.pri) -include(../../../../src/libs/extensionsystem/extensionsystem.pri) DEFINES += "PLUGINSPEC_DIR=\\\"$$PWD\\\"" diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro index 9119d149884..0f435476b6e 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro @@ -5,8 +5,8 @@ HEADERS += testplugin.h testplugin_global.h OTHER_FILES += testplugin.xml +QTC_LIB_DEPENDS += extensionsystem include(../../../../../qtcreator.pri) -include(../../../../../src/libs/extensionsystem/extensionsystem.pri) include(../../../qttestrpath.pri) COPYDIR = $$OUT_PWD diff --git a/tests/auto/filesearch/filesearch.pro b/tests/auto/filesearch/filesearch.pro index 93078377396..0ed02be4d64 100644 --- a/tests/auto/filesearch/filesearch.pro +++ b/tests/auto/filesearch/filesearch.pro @@ -1,7 +1,6 @@ +QTC_LIB_DEPENDS += utils include(../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) - # Input SOURCES += tst_filesearch.cpp diff --git a/tests/auto/qtcprocess/qtcprocess.pro b/tests/auto/qtcprocess/qtcprocess.pro index 7b06b64cd8a..6c46403de5e 100644 --- a/tests/auto/qtcprocess/qtcprocess.pro +++ b/tests/auto/qtcprocess/qtcprocess.pro @@ -1,5 +1,5 @@ +QTC_LIB_DEPENDS += utils include(../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) win32:DEFINES += _CRT_SECURE_NO_WARNINGS diff --git a/tests/auto/utils/fileutils/fileutils.pro b/tests/auto/utils/fileutils/fileutils.pro index 8446d8ff324..dd1ae2ec728 100644 --- a/tests/auto/utils/fileutils/fileutils.pro +++ b/tests/auto/utils/fileutils/fileutils.pro @@ -1,7 +1,6 @@ +QTC_LIB_DEPENDS += utils include(../../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) - UTILSDIR = $$IDE_SOURCE_TREE/src/libs/ DEFINES += QTCREATOR_UTILS_LIB diff --git a/tests/auto/utils_stringutils/utils_stringutils.pro b/tests/auto/utils_stringutils/utils_stringutils.pro index b1f68d2a4e4..9f7defa9574 100644 --- a/tests/auto/utils_stringutils/utils_stringutils.pro +++ b/tests/auto/utils_stringutils/utils_stringutils.pro @@ -1,5 +1,5 @@ +QTC_LIB_DEPENDS += utils include(../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) DEFINES -= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION diff --git a/tests/auto/valgrind/callgrind/callgrindparsertests.pro b/tests/auto/valgrind/callgrind/callgrindparsertests.pro index 3b77e9ac826..880b8235ba4 100644 --- a/tests/auto/valgrind/callgrind/callgrindparsertests.pro +++ b/tests/auto/valgrind/callgrind/callgrindparsertests.pro @@ -1,7 +1,6 @@ +QTC_LIB_DEPENDS += utils ssh include(../../qttest.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) -include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri) TARGET = tst_callgrindparsertests DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$_PRO_FILE_PWD_/data\\\"" diff --git a/tests/auto/valgrind/memcheck/modeldemo.pro b/tests/auto/valgrind/memcheck/modeldemo.pro index 24308f124ed..3ab4c582863 100644 --- a/tests/auto/valgrind/memcheck/modeldemo.pro +++ b/tests/auto/valgrind/memcheck/modeldemo.pro @@ -1,8 +1,7 @@ +QTC_LIB_DEPENDS += utils ssh include(../../../../qtcreator.pri) include(../../qttestrpath.pri) include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) -include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) TEMPLATE = app diff --git a/tests/auto/valgrind/memcheck/parsertests.pro b/tests/auto/valgrind/memcheck/parsertests.pro index d8faf95b4b8..24b86045600 100644 --- a/tests/auto/valgrind/memcheck/parsertests.pro +++ b/tests/auto/valgrind/memcheck/parsertests.pro @@ -1,7 +1,6 @@ +QTC_LIB_DEPENDS += utils ssh include(../../qttest.pri) include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) -include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) TARGET = tst_parsertests diff --git a/tests/auto/valgrind/memcheck/testrunner.pro b/tests/auto/valgrind/memcheck/testrunner.pro index 8e52ade154e..c4d8b0af707 100644 --- a/tests/auto/valgrind/memcheck/testrunner.pro +++ b/tests/auto/valgrind/memcheck/testrunner.pro @@ -1,6 +1,5 @@ +QTC_LIB_DEPENDS += utils ssh include(../../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) -include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) TARGET = tst_testrunner diff --git a/tests/manual/preprocessor/preprocessor.pro b/tests/manual/preprocessor/preprocessor.pro index 7140a015fec..623637a037c 100644 --- a/tests/manual/preprocessor/preprocessor.pro +++ b/tests/manual/preprocessor/preprocessor.pro @@ -2,11 +2,11 @@ QT = core macx:CONFIG -= app_bundle TARGET = pp -include(../../auto/qttest.pri) +QTC_LIB_DEPENDS += \ + cplusplus \ + utils -include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) -include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) +include(../../auto/qttest.pri) # Input SOURCES += main.cpp diff --git a/tests/manual/process/process.pro b/tests/manual/process/process.pro index 1dc2b958647..a8113dd2f4f 100644 --- a/tests/manual/process/process.pro +++ b/tests/manual/process/process.pro @@ -8,8 +8,8 @@ QT += core QT += gui +QTC_LIB_DEPENDS += utils include(../../../qtcreator.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) # -- Add creator 'utils' lib macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\" diff --git a/tests/manual/ssh/ssh.pri b/tests/manual/ssh/ssh.pri index 5f1a146eb5e..2d6e25e45a5 100644 --- a/tests/manual/ssh/ssh.pri +++ b/tests/manual/ssh/ssh.pri @@ -1,7 +1,7 @@ QT = core network +QTC_LIB_DEPENDS += ssh include (../../../qtcreator.pri) -include (../../../src/libs/ssh/ssh.pri) macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\" LIBS *= -L$$IDE_LIBRARY_PATH diff --git a/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro b/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro index eeee158f69f..acae9bec6a8 100644 --- a/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro +++ b/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro @@ -7,9 +7,9 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += console CONFIG -= app_bundle +QTC_LIB_DEPENDS += utils include(../../../auto/qttest.pri) include(../../../../src/rpath.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) UTILSDIR = ../../../../src/libs/utils diff --git a/tests/tools/qml-ast2dot/qml-ast2dot.pro b/tests/tools/qml-ast2dot/qml-ast2dot.pro index 733fd8c60e0..41faba1d530 100644 --- a/tests/tools/qml-ast2dot/qml-ast2dot.pro +++ b/tests/tools/qml-ast2dot/qml-ast2dot.pro @@ -1,12 +1,9 @@ QT = core gui +QTC_LIB_DEPENDS += qmljs include(../../../qtcreator.pri) macx:CONFIG -= app_bundle TARGET = qml-ast2dot -include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) -include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri) - # Input SOURCES += main.cpp