From cabd00ed8896d44c68523c226dd5c425255610e4 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 Feb 2013 15:34:00 +0100 Subject: [PATCH] QmlJSTools: Clean up dependencies Remove Debugger dependency to QmlJSTools . Instead mark all modules that use QmlJSTools API as dependent, even if the dependency is already implicit (QmlProjectManager depending on QmlJSEditor). Change-Id: I9e936429674fbd580dafc348b6695d07158e5341 Reviewed-by: Fawzi Mohamed Reviewed-by: Daniel Teske --- src/plugins/debugger/debugger.qbs | 1 - src/plugins/plugins.pro | 5 ++++- src/plugins/qmlprofiler/QmlProfiler.pluginspec.in | 1 + src/plugins/qmlprofiler/qmlprofiler.pro | 1 + .../qmlprojectmanager/QmlProjectManager.pluginspec.in | 1 + src/plugins/qmlprojectmanager/qmlprojectmanager.qbs | 1 + .../qmlprojectmanager/qmlprojectmanager_dependencies.pri | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index d87a42171f2..b67ccd5811d 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -9,7 +9,6 @@ QtcPlugin { Depends { name: "Qt"; submodules: ["widgets", "network", "script"] } Depends { name: "Core" } Depends { name: "CppTools" } - Depends { name: "QmlJSTools" } Depends { name: "Find" } Depends { name: "ProjectExplorer" } Depends { name: "TextEditor" } diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index ed622bd11fc..987ca8d4f0c 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -171,6 +171,7 @@ plugin_qt4projectmanager.depends += plugin_qtsupport plugin_qt4projectmanager.depends += plugin_cpptools plugin_qt4projectmanager.depends += plugin_debugger plugin_qt4projectmanager.depends += plugin_qmljseditor +plugin_qt4projectmanager.depends += plugin_qmljstools plugin_remotelinux.subdir = remotelinux plugin_remotelinux.depends += plugin_coreplugin @@ -206,7 +207,6 @@ plugin_debugger.subdir = debugger plugin_debugger.depends = plugin_projectexplorer plugin_debugger.depends += plugin_coreplugin plugin_debugger.depends += plugin_cpptools -plugin_debugger.depends += plugin_qmljstools plugin_fakevim.subdir = fakevim plugin_fakevim.depends = plugin_coreplugin @@ -269,6 +269,7 @@ plugin_qmlprojectmanager.subdir = qmlprojectmanager plugin_qmlprojectmanager.depends = plugin_texteditor plugin_qmlprojectmanager.depends += plugin_projectexplorer plugin_qmlprojectmanager.depends += plugin_qmljseditor +plugin_qmlprojectmanager.depends += plugin_qmljstools plugin_qmlprojectmanager.depends += plugin_debugger plugin_qmlprojectmanager.depends += plugin_qtsupport @@ -319,6 +320,7 @@ plugin_qmlprofiler.depends += plugin_analyzerbase plugin_qmlprofiler.depends += plugin_qmlprojectmanager plugin_qmlprofiler.depends += plugin_qt4projectmanager plugin_qmlprofiler.depends += plugin_remotelinux +plugin_qmlprofiler.depends += plugin_qmljstools plugin_qmljstools.subdir = qmljstools plugin_qmljstools.depends = plugin_projectexplorer @@ -349,6 +351,7 @@ plugin_qbsprojectmanager.subdir = qbsprojectmanager plugin_qbsprojectmanager.depends = plugin_texteditor plugin_qbsprojectmanager.depends += plugin_projectexplorer plugin_qbsprojectmanager.depends += plugin_cpptools +plugin_qbsprojectmanager.depends += plugin_qmljstools plugin_qbsprojectmanager.depends += plugin_qtsupport plugin_clearcase.subdir = clearcase diff --git a/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in b/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in index 0e748f93a75..19fc666230d 100644 --- a/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in +++ b/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in @@ -17,6 +17,7 @@ + diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro index ca75dc68c00..6f9841f6974 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.pro +++ b/src/plugins/qmlprofiler/qmlprofiler.pro @@ -10,6 +10,7 @@ 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) diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in index 0de93f8f852..004d66da4db 100644 --- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in +++ b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in @@ -17,6 +17,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General + diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs index 3900c9d1084..06527a94628 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs @@ -12,6 +12,7 @@ QtcPlugin { Depends { name: "TextEditor" } Depends { name: "QmlJSEditor" } Depends { name: "QmlJS" } + Depends { name: "QmlJSTools" } Depends { name: "Debugger" } Depends { name: "QtSupport" } Depends { name: "app_version_header" } diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri index 24a66d37a2a..397018b9103 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri @@ -1,5 +1,6 @@ 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)