diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2010-09-28 12:59:29 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2010-10-01 13:43:41 +0200 |
commit | 6929d66ff23d9a84b6e1d425dcf234192f3ce9bc (patch) | |
tree | 4ef3ac77411be2a53240ccc03c714434d5c18bcc | |
parent | eff5ceea64f39708039915d0e867f62ff5a7ea7f (diff) |
QmlObserver: Prevent messages from being sent if there is no server side
Actually this is fixed in QDeclarativeService::sendMessage, too, but the
fix won't be part of 4.7.1, so better double-check.
Reviewed-by: Christiaan Janssen
-rw-r--r-- | share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h | 2 | ||||
-rw-r--r-- | share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h index 0711348bbe..66084cd92c 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h @@ -70,6 +70,8 @@ public: void reloaded(); QString idStringForObject(QObject *obj) const; + void sendMessage(const QByteArray &message); + public Q_SLOTS: void selectedColorChanged(const QColor &color); void contextPathUpdated(const QStringList &contextPath); diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp index 0b79609551..114cd15cf6 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp @@ -236,4 +236,12 @@ QString QDeclarativeObserverService::idStringForObject(QObject *obj) const return idString; } +void QDeclarativeObserverService::sendMessage(const QByteArray &message) +{ + if (status() != Enabled) + return; + + QDeclarativeDebugService::sendMessage(message); +} + } // namespace QmlJSDebugger |