forked from qt-creator/qt-creator
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 <fawzi.mohamed@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
@@ -9,7 +9,6 @@ QtcPlugin {
|
|||||||
Depends { name: "Qt"; submodules: ["widgets", "network", "script"] }
|
Depends { name: "Qt"; submodules: ["widgets", "network", "script"] }
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
Depends { name: "CppTools" }
|
Depends { name: "CppTools" }
|
||||||
Depends { name: "QmlJSTools" }
|
|
||||||
Depends { name: "Find" }
|
Depends { name: "Find" }
|
||||||
Depends { name: "ProjectExplorer" }
|
Depends { name: "ProjectExplorer" }
|
||||||
Depends { name: "TextEditor" }
|
Depends { name: "TextEditor" }
|
||||||
|
|||||||
@@ -171,6 +171,7 @@ plugin_qt4projectmanager.depends += plugin_qtsupport
|
|||||||
plugin_qt4projectmanager.depends += plugin_cpptools
|
plugin_qt4projectmanager.depends += plugin_cpptools
|
||||||
plugin_qt4projectmanager.depends += plugin_debugger
|
plugin_qt4projectmanager.depends += plugin_debugger
|
||||||
plugin_qt4projectmanager.depends += plugin_qmljseditor
|
plugin_qt4projectmanager.depends += plugin_qmljseditor
|
||||||
|
plugin_qt4projectmanager.depends += plugin_qmljstools
|
||||||
|
|
||||||
plugin_remotelinux.subdir = remotelinux
|
plugin_remotelinux.subdir = remotelinux
|
||||||
plugin_remotelinux.depends += plugin_coreplugin
|
plugin_remotelinux.depends += plugin_coreplugin
|
||||||
@@ -206,7 +207,6 @@ plugin_debugger.subdir = debugger
|
|||||||
plugin_debugger.depends = plugin_projectexplorer
|
plugin_debugger.depends = plugin_projectexplorer
|
||||||
plugin_debugger.depends += plugin_coreplugin
|
plugin_debugger.depends += plugin_coreplugin
|
||||||
plugin_debugger.depends += plugin_cpptools
|
plugin_debugger.depends += plugin_cpptools
|
||||||
plugin_debugger.depends += plugin_qmljstools
|
|
||||||
|
|
||||||
plugin_fakevim.subdir = fakevim
|
plugin_fakevim.subdir = fakevim
|
||||||
plugin_fakevim.depends = plugin_coreplugin
|
plugin_fakevim.depends = plugin_coreplugin
|
||||||
@@ -269,6 +269,7 @@ plugin_qmlprojectmanager.subdir = qmlprojectmanager
|
|||||||
plugin_qmlprojectmanager.depends = plugin_texteditor
|
plugin_qmlprojectmanager.depends = plugin_texteditor
|
||||||
plugin_qmlprojectmanager.depends += plugin_projectexplorer
|
plugin_qmlprojectmanager.depends += plugin_projectexplorer
|
||||||
plugin_qmlprojectmanager.depends += plugin_qmljseditor
|
plugin_qmlprojectmanager.depends += plugin_qmljseditor
|
||||||
|
plugin_qmlprojectmanager.depends += plugin_qmljstools
|
||||||
plugin_qmlprojectmanager.depends += plugin_debugger
|
plugin_qmlprojectmanager.depends += plugin_debugger
|
||||||
plugin_qmlprojectmanager.depends += plugin_qtsupport
|
plugin_qmlprojectmanager.depends += plugin_qtsupport
|
||||||
|
|
||||||
@@ -319,6 +320,7 @@ plugin_qmlprofiler.depends += plugin_analyzerbase
|
|||||||
plugin_qmlprofiler.depends += plugin_qmlprojectmanager
|
plugin_qmlprofiler.depends += plugin_qmlprojectmanager
|
||||||
plugin_qmlprofiler.depends += plugin_qt4projectmanager
|
plugin_qmlprofiler.depends += plugin_qt4projectmanager
|
||||||
plugin_qmlprofiler.depends += plugin_remotelinux
|
plugin_qmlprofiler.depends += plugin_remotelinux
|
||||||
|
plugin_qmlprofiler.depends += plugin_qmljstools
|
||||||
|
|
||||||
plugin_qmljstools.subdir = qmljstools
|
plugin_qmljstools.subdir = qmljstools
|
||||||
plugin_qmljstools.depends = plugin_projectexplorer
|
plugin_qmljstools.depends = plugin_projectexplorer
|
||||||
@@ -349,6 +351,7 @@ plugin_qbsprojectmanager.subdir = qbsprojectmanager
|
|||||||
plugin_qbsprojectmanager.depends = plugin_texteditor
|
plugin_qbsprojectmanager.depends = plugin_texteditor
|
||||||
plugin_qbsprojectmanager.depends += plugin_projectexplorer
|
plugin_qbsprojectmanager.depends += plugin_projectexplorer
|
||||||
plugin_qbsprojectmanager.depends += plugin_cpptools
|
plugin_qbsprojectmanager.depends += plugin_cpptools
|
||||||
|
plugin_qbsprojectmanager.depends += plugin_qmljstools
|
||||||
plugin_qbsprojectmanager.depends += plugin_qtsupport
|
plugin_qbsprojectmanager.depends += plugin_qtsupport
|
||||||
|
|
||||||
plugin_clearcase.subdir = clearcase
|
plugin_clearcase.subdir = clearcase
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
|
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
<dependency name=\"AnalyzerBase\" version=\"$$QTCREATOR_VERSION\"/>
|
<dependency name=\"AnalyzerBase\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
<dependency name=\"QmlProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
|
<dependency name=\"QmlProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
|
<dependency name=\"QmlJSTools\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
<dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
|
<dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
<dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
|
<dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
</dependencyList>
|
</dependencyList>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ include(../../plugins/coreplugin/coreplugin.pri)
|
|||||||
include(../../plugins/analyzerbase/analyzerbase.pri)
|
include(../../plugins/analyzerbase/analyzerbase.pri)
|
||||||
include(../../plugins/qmlprojectmanager/qmlprojectmanager.pri)
|
include(../../plugins/qmlprojectmanager/qmlprojectmanager.pri)
|
||||||
include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
|
include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
|
||||||
|
include(../../plugins/qmljstools/qmljstools.pri)
|
||||||
include(../../plugins/remotelinux/remotelinux.pri)
|
include(../../plugins/remotelinux/remotelinux.pri)
|
||||||
include(../../libs/qmldebug/qmldebug.pri)
|
include(../../libs/qmldebug/qmldebug.pri)
|
||||||
include(../../libs/extensionsystem/extensionsystem.pri)
|
include(../../libs/extensionsystem/extensionsystem.pri)
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
|
|||||||
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
|
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
|
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
<dependency name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\"/>
|
<dependency name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
|
<dependency name=\"QmlJSTools\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
<dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\" />
|
<dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\" />
|
||||||
<dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\" />
|
<dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\" />
|
||||||
</dependencyList>
|
</dependencyList>
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ QtcPlugin {
|
|||||||
Depends { name: "TextEditor" }
|
Depends { name: "TextEditor" }
|
||||||
Depends { name: "QmlJSEditor" }
|
Depends { name: "QmlJSEditor" }
|
||||||
Depends { name: "QmlJS" }
|
Depends { name: "QmlJS" }
|
||||||
|
Depends { name: "QmlJSTools" }
|
||||||
Depends { name: "Debugger" }
|
Depends { name: "Debugger" }
|
||||||
Depends { name: "QtSupport" }
|
Depends { name: "QtSupport" }
|
||||||
Depends { name: "app_version_header" }
|
Depends { name: "app_version_header" }
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
include(../../plugins/projectexplorer/projectexplorer.pri)
|
include(../../plugins/projectexplorer/projectexplorer.pri)
|
||||||
include(../../plugins/texteditor/texteditor.pri)
|
include(../../plugins/texteditor/texteditor.pri)
|
||||||
include(../../plugins/qmljseditor/qmljseditor.pri)
|
include(../../plugins/qmljseditor/qmljseditor.pri)
|
||||||
|
include(../../plugins/qmljstools/qmljstools.pri)
|
||||||
include(../../plugins/debugger/debugger.pri)
|
include(../../plugins/debugger/debugger.pri)
|
||||||
include(../../plugins/qtsupport/qtsupport.pri)
|
include(../../plugins/qtsupport/qtsupport.pri)
|
||||||
|
|||||||
Reference in New Issue
Block a user