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 39b559c..47b17c4 100644 (file)
--- 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 121a847..9120c51 100644 (file)
--- 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 4258882..d398150 100644 (file)
--- 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 16b5145..0b79609 100644 (file)
--- 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)