From 36dfdf2ef91ecd6170fbe191c7df9ce6d46cd12c Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 12 Apr 2012 14:46:02 +0200
Subject: [PATCH] QmlJSInspector: Clean up dependencies

Change-Id: Ic7a721a085b9849195a91d49daf3d685e499e121
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
---
 src/plugins/plugins.pro                                 | 3 +--
 src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in | 4 ----
 src/plugins/qmljsinspector/qmljsinspector.cpp           | 2 --
 src/plugins/qmljsinspector/qmljsinspector.h             | 2 +-
 src/plugins/qmljsinspector/qmljsinspector.pro           | 9 +++------
 src/plugins/qmljsinspector/qmljsinspectorplugin.cpp     | 2 --
 6 files changed, 5 insertions(+), 17 deletions(-)

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.</license>
     <description>Debugger for QML files</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name=\"QmlProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
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 <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/applicationrunconfiguration.h>
-#include <qmlprojectmanager/qmlprojectconstants.h>
-#include <qmlprojectmanager/qmlprojectrunconfiguration.h>
 
 #include <extensionsystem/pluginmanager.h>
 
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 <qmlprojectmanager/qmlprojectrunconfiguration.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <utils/fileinprojectfinder.h>
 
 #include <qmljs/qmljsdocument.h>
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 <debugger/debuggerconstants.h>
 #include <debugger/qml/qmladapter.h>
 #include <extensionsystem/pluginmanager.h>
-#include <qmljseditor/qmljseditorconstants.h>
-#include <qmlprojectmanager/qmlproject.h>
 #include <utils/qtcassert.h>
 
 #include <QStringList>