From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 27 Sep 2010 08:25:01 +0000 (+0200)
Subject: QmlJSDebugger: Update API to changes in QDeclarativeEngine
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f343cc4bd4506e77e52de5ac44cf63d0947e9775;p=qt-creator-jp%2Fqt-creator-jp.git

QmlJSDebugger: Update API to changes in QDeclarativeEngine

Reviewed-by: Christiaan Janssen
---

diff --git a/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h b/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h
index 39b559cabe..47b17c409c 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h
@@ -103,7 +103,7 @@ public:
                        const QVariant &argument = QVariant());
 
     void messageReceived(const QByteArray &);
-    void enabledChanged(bool);
+    void statusChanged(Status status);
 
 public slots:
 //    void pauses();
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
index 121a847684..9120c51e84 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
@@ -98,7 +98,7 @@ Q_SIGNALS:
     void clearComponentCacheRequested();
 
 protected:
-    virtual void enabledChanged(bool enabled);
+    virtual void statusChanged(Status status);
     virtual void messageReceived(const QByteArray &);
 
 private:
diff --git a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp
index 4258882e10..d398150720 100644
--- a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp
@@ -511,9 +511,10 @@ void JSDebuggerAgent::continueExec()
     loop.quit();
 }
 
-void JSDebuggerAgent::enabledChanged(bool on)
+void JSDebuggerAgent::statusChanged(Status status)
 {
     engine()->setAgent(on ? this : 0);
+    engine()->setAgent((status == QDeclarativeDebugService::Enabled) ? this : 0);
 }
 
 } // namespace QmlJSDebugger
diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp
index 16b5145e74..0b79609551 100644
--- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp
@@ -60,9 +60,9 @@ QDeclarativeObserverService *QDeclarativeObserverService::instance()
     return serviceInstance();
 }
 
-void QDeclarativeObserverService::enabledChanged(bool enabled)
+void QDeclarativeObserverService::statusChanged(Status status)
 {
-    emit debuggingClientChanged(enabled);
+    emit debuggingClientChanged((status == Enabled));
 }
 
 void QDeclarativeObserverService::messageReceived(const QByteArray &message)