Merge QML inspector into debugger plugin

Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.

Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

src/plugins/debugger/qml/qmladapter.h

@@ -35,18 +35,21 @@
 
 #include "debugger_global.h"
 
-#include <QObject>
-#include <QAbstractSocket>
 #include <qmldebug/qmldebugclient.h>
 
+#include <QAbstractSocket>
+#include <QObject>
+#include <QPointer>
+#include <QTimer>
+
+using namespace QmlDebug;
+
 namespace QmlDebug {
 class BaseEngineDebugClient;
 class QmlDebugConnection;
 class QDebugMessageClient;
 }
 
-using namespace QmlDebug;
-
 namespace Debugger {
 
 class DebuggerEngine;
@@ -54,9 +57,8 @@ class DebuggerEngine;
 namespace Internal {
 class BaseQmlDebuggerClient;
 class QmlAdapterPrivate;
-} // namespace Internal
 
-class DEBUGGER_EXPORT QmlAdapter : public QObject
+class QmlAdapter : public QObject
 {
     Q_OBJECT
 
@@ -79,14 +81,8 @@ public:
     QHash<QString, Internal::BaseQmlDebuggerClient*> debuggerClients();
 
     BaseEngineDebugClient *engineDebugClient() const;
-    void setEngineDebugClient(BaseEngineDebugClient *client);
-
     QDebugMessageClient *messageClient() const;
 
-    int currentSelectedDebugId() const;
-    QString currentSelectedDisplayName() const;
-    void setCurrentSelectedDebugInfo(int debugId, const QString &displayName = QString());
-
 public slots:
     void logServiceStatusChange(const QString &service, float version,
                                 QmlDebugClient::Status newStatus);
@@ -98,7 +94,6 @@ signals:
     void connectionStartupFailed();
     void connectionError(QAbstractSocket::SocketError socketError);
     void serviceConnectionError(const QString serviceName);
-    void selectionChanged();
 
 private slots:
     void connectionErrorOccurred(QAbstractSocket::SocketError socketError);
@@ -113,9 +108,15 @@ private:
     void showConnectionErrorMessage(const QString &message);
 
 private:
-    Internal::QmlAdapterPrivate *d;
+    QPointer<DebuggerEngine> m_engine;
+    BaseQmlDebuggerClient *m_qmlClient;
+    QTimer m_connectionTimer;
+    QmlDebugConnection *m_conn;
+    QHash<QString, BaseQmlDebuggerClient*> m_debugClients;
+    QDebugMessageClient *m_msgClient;
 };
 
+} // namespace Internal
 } // namespace Debugger
 
 #endif // QMLADAPTER_H