diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-21 16:04:57 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-22 16:41:39 +0200 |
commit | 24ee641543b51d1497114070fd574b095ff68958 (patch) | |
tree | 300cd23ff043440650d2292e4ceb81f8b7605d71 | |
parent | ec442f55040180ff95a83ee338adfd275dc32d9e (diff) | |
download | qt-creator-24ee641543b51d1497114070fd574b095ff68958.tar.gz |
Fix dependency information according to output of dependency checker
Change-Id: Ic1259f04f4120b6e495ebb3672f7f360c71cba7f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
30 files changed, 45 insertions, 22 deletions
diff --git a/src/plugins/analyzerbase/analyzerbase_dependencies.pri b/src/plugins/analyzerbase/analyzerbase_dependencies.pri index f522d75995..d2eb90395b 100644 --- a/src/plugins/analyzerbase/analyzerbase_dependencies.pri +++ b/src/plugins/analyzerbase/analyzerbase_dependencies.pri @@ -5,4 +5,5 @@ QTC_LIB_DEPENDS += \ QTC_PLUGIN_DEPENDS += \ coreplugin \ projectexplorer \ + texteditor \ cpptools diff --git a/src/plugins/android/android_dependencies.pri b/src/plugins/android/android_dependencies.pri index 4258eb781b..5fe7ef6bee 100644 --- a/src/plugins/android/android_dependencies.pri +++ b/src/plugins/android/android_dependencies.pri @@ -4,4 +4,6 @@ QTC_PLUGIN_DEPENDS += \ debugger \ projectexplorer \ qt4projectmanager \ + qtsupport \ + texteditor \ analyzerbase diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri index af5484d1db..50bedbccf7 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri @@ -2,5 +2,4 @@ QTC_PLUGIN_NAME = AutotoolsProjectManager QTC_PLUGIN_DEPENDS += \ projectexplorer \ coreplugin \ - cpptools \ - qtsupport + cpptools diff --git a/src/plugins/bazaar/bazaar_dependencies.pri b/src/plugins/bazaar/bazaar_dependencies.pri index a964c2be0e..a7c268a0d7 100644 --- a/src/plugins/bazaar/bazaar_dependencies.pri +++ b/src/plugins/bazaar/bazaar_dependencies.pri @@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Bazaar QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ - projectexplorer \ + locator \ texteditor \ coreplugin \ vcsbase diff --git a/src/plugins/bineditor/bineditor_dependencies.pri b/src/plugins/bineditor/bineditor_dependencies.pri index 825c980e92..cbc6861ca1 100644 --- a/src/plugins/bineditor/bineditor_dependencies.pri +++ b/src/plugins/bineditor/bineditor_dependencies.pri @@ -2,5 +2,6 @@ QTC_PLUGIN_NAME = BinEditor QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ + find \ texteditor \ coreplugin diff --git a/src/plugins/clearcase/clearcase_dependencies.pri b/src/plugins/clearcase/clearcase_dependencies.pri index 52d7309af5..3b39e2730e 100644 --- a/src/plugins/clearcase/clearcase_dependencies.pri +++ b/src/plugins/clearcase/clearcase_dependencies.pri @@ -2,6 +2,7 @@ QTC_PLUGIN_NAME = ClearCase QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ + locator \ projectexplorer \ texteditor \ coreplugin \ diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri index 7ebfd23a06..7ae1e8c822 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri @@ -1,5 +1,7 @@ QTC_PLUGIN_NAME = CMakeProjectManager QTC_PLUGIN_DEPENDS += \ + coreplugin \ + locator \ projectexplorer \ cpptools \ texteditor \ diff --git a/src/plugins/cppeditor/cppeditor_dependencies.pri b/src/plugins/cppeditor/cppeditor_dependencies.pri index a799ff9317..5150da6ea0 100644 --- a/src/plugins/cppeditor/cppeditor_dependencies.pri +++ b/src/plugins/cppeditor/cppeditor_dependencies.pri @@ -5,4 +5,5 @@ QTC_LIB_DEPENDS += \ QTC_PLUGIN_DEPENDS += \ texteditor \ coreplugin \ - cpptools + cpptools \ + projectexplorer diff --git a/src/plugins/cpptools/cpptools_dependencies.pri b/src/plugins/cpptools/cpptools_dependencies.pri index b93363db2a..15f93ba837 100644 --- a/src/plugins/cpptools/cpptools_dependencies.pri +++ b/src/plugins/cpptools/cpptools_dependencies.pri @@ -3,6 +3,7 @@ QTC_LIB_DEPENDS += \ languageutils \ cplusplus QTC_PLUGIN_DEPENDS += \ + coreplugin \ projectexplorer \ texteditor \ locator \ diff --git a/src/plugins/cvs/cvs_dependencies.pri b/src/plugins/cvs/cvs_dependencies.pri index 612bc3dda1..a10e575988 100644 --- a/src/plugins/cvs/cvs_dependencies.pri +++ b/src/plugins/cvs/cvs_dependencies.pri @@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = CVS QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ - projectexplorer \ + locator \ texteditor \ coreplugin \ vcsbase diff --git a/src/plugins/designer/designer_dependencies.pri b/src/plugins/designer/designer_dependencies.pri index 417689ea9f..d5b187f377 100644 --- a/src/plugins/designer/designer_dependencies.pri +++ b/src/plugins/designer/designer_dependencies.pri @@ -4,5 +4,6 @@ QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ cpptools \ + projectexplorer \ texteditor \ coreplugin diff --git a/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri b/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri index 224aece4bd..b33e88a474 100644 --- a/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri +++ b/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri @@ -1,5 +1,6 @@ QTC_PLUGIN_NAME = GenericProjectManager QTC_PLUGIN_DEPENDS += \ + coreplugin \ projectexplorer \ cpptools \ texteditor \ diff --git a/src/plugins/git/git_dependencies.pri b/src/plugins/git/git_dependencies.pri index e21fdc7299..6e7123f247 100644 --- a/src/plugins/git/git_dependencies.pri +++ b/src/plugins/git/git_dependencies.pri @@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Git QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ - projectexplorer \ + locator \ texteditor \ coreplugin \ vcsbase \ diff --git a/src/plugins/glsleditor/glsleditor_dependencies.pri b/src/plugins/glsleditor/glsleditor_dependencies.pri index 073940cd73..da28d3dd09 100644 --- a/src/plugins/glsleditor/glsleditor_dependencies.pri +++ b/src/plugins/glsleditor/glsleditor_dependencies.pri @@ -6,5 +6,4 @@ QTC_LIB_DEPENDS += \ QTC_PLUGIN_DEPENDS += \ coreplugin \ texteditor \ - projectexplorer \ cpptools diff --git a/src/plugins/madde/madde_dependencies.pri b/src/plugins/madde/madde_dependencies.pri index c5affe494d..d2676a133a 100644 --- a/src/plugins/madde/madde_dependencies.pri +++ b/src/plugins/madde/madde_dependencies.pri @@ -1,4 +1,8 @@ QTC_PLUGIN_NAME = Madde QTC_PLUGIN_DEPENDS += \ + coreplugin \ + debugger \ + projectexplorer \ qt4projectmanager \ + qtsupport \ remotelinux diff --git a/src/plugins/mercurial/mercurial_dependencies.pri b/src/plugins/mercurial/mercurial_dependencies.pri index 3f3428c747..8de4e4595d 100644 --- a/src/plugins/mercurial/mercurial_dependencies.pri +++ b/src/plugins/mercurial/mercurial_dependencies.pri @@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Mercurial QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ - projectexplorer \ + locator \ texteditor \ coreplugin \ vcsbase diff --git a/src/plugins/perforce/perforce_dependencies.pri b/src/plugins/perforce/perforce_dependencies.pri index 8769ff4e34..7e46fc7990 100644 --- a/src/plugins/perforce/perforce_dependencies.pri +++ b/src/plugins/perforce/perforce_dependencies.pri @@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Perforce QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ - projectexplorer \ + locator \ texteditor \ coreplugin \ vcsbase diff --git a/src/plugins/pythoneditor/pythoneditor_dependencies.pri b/src/plugins/pythoneditor/pythoneditor_dependencies.pri index 8c2256879e..c336195f01 100644 --- a/src/plugins/pythoneditor/pythoneditor_dependencies.pri +++ b/src/plugins/pythoneditor/pythoneditor_dependencies.pri @@ -2,6 +2,5 @@ QTC_PLUGIN_NAME = PythonEditor QTC_PLUGIN_DEPENDS += \ coreplugin \ texteditor \ - cpptools \ qtsupport \ projectexplorer diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri b/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri index b0e4f4021f..d72c37a060 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri @@ -1,7 +1,7 @@ QTC_PLUGIN_NAME = QbsProjectManager QTC_PLUGIN_DEPENDS += \ + coreplugin \ projectexplorer \ cpptools \ - texteditor \ qtsupport \ qmljstools diff --git a/src/plugins/qmldesigner/qmldesigner_dependencies.pri b/src/plugins/qmldesigner/qmldesigner_dependencies.pri index cb37cee50f..d341b0e0f6 100644 --- a/src/plugins/qmldesigner/qmldesigner_dependencies.pri +++ b/src/plugins/qmldesigner/qmldesigner_dependencies.pri @@ -7,8 +7,7 @@ QTC_PLUGIN_DEPENDS += \ coreplugin \ texteditor \ qmljseditor \ - qt4projectmanager \ - qmlprojectmanager \ + qtsupport \ projectexplorer INCLUDEPATH *= \ $$PWD/../../../share/qtcreator/qml/qmlpuppet/interfaces \ diff --git a/src/plugins/qmljseditor/qmljseditor_dependencies.pri b/src/plugins/qmljseditor/qmljseditor_dependencies.pri index 56134f0334..481638aa2a 100644 --- a/src/plugins/qmljseditor/qmljseditor_dependencies.pri +++ b/src/plugins/qmljseditor/qmljseditor_dependencies.pri @@ -4,6 +4,7 @@ QTC_LIB_DEPENDS += \ qmleditorwidgets QTC_PLUGIN_DEPENDS += \ coreplugin \ + find \ texteditor \ projectexplorer \ qmljstools diff --git a/src/plugins/qmljstools/qmljstools_dependencies.pri b/src/plugins/qmljstools/qmljstools_dependencies.pri index fec65a83be..2dd8e9b1c6 100644 --- a/src/plugins/qmljstools/qmljstools_dependencies.pri +++ b/src/plugins/qmljstools/qmljstools_dependencies.pri @@ -4,6 +4,9 @@ QTC_LIB_DEPENDS += \ cplusplus \ qmljs QTC_PLUGIN_DEPENDS += \ + coreplugin \ + find \ + locator \ projectexplorer \ qtsupport \ texteditor \ diff --git a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri index 9685afccc3..47e65ba235 100644 --- a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri +++ b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri @@ -3,8 +3,11 @@ QTC_LIB_DEPENDS += \ qmldebug \ extensionsystem QTC_PLUGIN_DEPENDS += \ - coreplugin \ analyzerbase \ + coreplugin \ + debugger \ + projectexplorer \ qmlprojectmanager \ - qt4projectmanager \ - qmljstools + qmljstools \ + qtsupport \ + texteditor diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri index 26bb7e215f..ab44cf7023 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri @@ -1,8 +1,7 @@ QTC_PLUGIN_NAME = QmlProjectManager QTC_PLUGIN_DEPENDS += \ + coreplugin \ projectexplorer \ - texteditor \ - qmljseditor \ qmljstools \ debugger \ qtsupport diff --git a/src/plugins/qnx/qnx_dependencies.pri b/src/plugins/qnx/qnx_dependencies.pri index e1019e0b92..ff6219cb39 100644 --- a/src/plugins/qnx/qnx_dependencies.pri +++ b/src/plugins/qnx/qnx_dependencies.pri @@ -1,6 +1,9 @@ QTC_PLUGIN_NAME = Qnx QTC_PLUGIN_DEPENDS += \ coreplugin \ + debugger \ + projectexplorer \ qt4projectmanager \ + qtsupport \ remotelinux \ texteditor diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri index b72e6d0181..53dbae127b 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri +++ b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri @@ -2,10 +2,11 @@ QTC_PLUGIN_NAME = Qt4ProjectManager QTC_LIB_DEPENDS += \ qmljs QTC_PLUGIN_DEPENDS += \ + coreplugin \ projectexplorer \ qtsupport \ + texteditor \ cpptools \ - debugger \ qmljstools QTC_PLUGIN_RECOMMENDS += \ designer diff --git a/src/plugins/qtsupport/qtsupport_dependencies.pri b/src/plugins/qtsupport/qtsupport_dependencies.pri index 4cbf35cb2e..fb03eb1c12 100644 --- a/src/plugins/qtsupport/qtsupport_dependencies.pri +++ b/src/plugins/qtsupport/qtsupport_dependencies.pri @@ -3,7 +3,9 @@ QTC_LIB_DEPENDS += \ qmljs \ utils QTC_PLUGIN_DEPENDS += \ - projectexplorer + coreplugin \ + projectexplorer \ + texteditor DEFINES *= \ QMAKE_AS_LIBRARY \ PROPARSER_THREAD_SAFE \ diff --git a/src/plugins/subversion/subversion_dependencies.pri b/src/plugins/subversion/subversion_dependencies.pri index 3caa1e28fa..297af991b6 100644 --- a/src/plugins/subversion/subversion_dependencies.pri +++ b/src/plugins/subversion/subversion_dependencies.pri @@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Subversion QTC_LIB_DEPENDS += \ utils QTC_PLUGIN_DEPENDS += \ - projectexplorer \ + locator \ texteditor \ coreplugin \ vcsbase diff --git a/src/plugins/todo/todo_dependencies.pri b/src/plugins/todo/todo_dependencies.pri index e310abc598..5f98f13aa0 100644 --- a/src/plugins/todo/todo_dependencies.pri +++ b/src/plugins/todo/todo_dependencies.pri @@ -4,5 +4,4 @@ QTC_LIB_DEPENDS += \ QTC_PLUGIN_DEPENDS += \ coreplugin \ projectexplorer \ - texteditor \ cpptools diff --git a/src/plugins/valgrind/valgrind_dependencies.pri b/src/plugins/valgrind/valgrind_dependencies.pri index cd56d7ea29..ed2c6fff60 100644 --- a/src/plugins/valgrind/valgrind_dependencies.pri +++ b/src/plugins/valgrind/valgrind_dependencies.pri @@ -5,5 +5,6 @@ QTC_LIB_DEPENDS += \ QTC_PLUGIN_DEPENDS += \ analyzerbase \ coreplugin \ + projectexplorer \ texteditor \ remotelinux |