diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 0bfef636e1b..fb8e76952b5 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -257,9 +257,8 @@ plugin_qmldesigner.depends += plugin_qmlprojectmanager plugin_qmldesigner.depends += plugin_cpptools plugin_qmljsinspector.subdir = qmljsinspector -plugin_qmljsinspector.depends += plugin_projectexplorer -plugin_qmljsinspector.depends += plugin_qmlprojectmanager plugin_qmljsinspector.depends += plugin_debugger +plugin_qmljsinspector.depends += plugin_qmljseditor plugin_mercurial.subdir = mercurial plugin_mercurial.depends = plugin_vcsbase diff --git a/src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in b/src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in index a35c22c2c74..d1da4351485 100644 --- a/src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in +++ b/src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in @@ -20,10 +20,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. Debugger for QML files http://qt.nokia.com - - - - diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp index c67139938da..df2f658b018 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.cpp +++ b/src/plugins/qmljsinspector/qmljsinspector.cpp @@ -81,8 +81,6 @@ #include #include #include -#include -#include #include diff --git a/src/plugins/qmljsinspector/qmljsinspector.h b/src/plugins/qmljsinspector/qmljsinspector.h index 37796b75221..20bad0a36d1 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.h +++ b/src/plugins/qmljsinspector/qmljsinspector.h @@ -35,7 +35,7 @@ #include "qmljsprivateapi.h" -#include +#include #include #include diff --git a/src/plugins/qmljsinspector/qmljsinspector.pro b/src/plugins/qmljsinspector/qmljsinspector.pro index 72d6395bff8..c50cc52088b 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.pro +++ b/src/plugins/qmljsinspector/qmljsinspector.pro @@ -41,10 +41,7 @@ include(../../../share/qtcreator/qml/qmljsdebugger/protocol/protocol.pri) RESOURCES += qmljsinspector.qrc include(../../qtcreatorplugin.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/qmlprojectmanager/qmlprojectmanager.pri) -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/texteditor/texteditor.pri) -include(../../plugins/debugger/debugger.pri) -include(../../libs/utils/utils.pri) include(../../libs/qmljsdebugclient/qmljsdebugclient.pri) + +include(../../plugins/debugger/debugger.pri) +include(../../plugins/qmljseditor/qmljseditor.pri) diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp index 8378c1b3003..9c0f416d9d9 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp @@ -45,8 +45,6 @@ #include #include #include -#include -#include #include #include