feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlObserver: Prevent messages from being sent if there is no server side

Browse Source 
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
This commit is contained in:
Kai Koehne
2010-09-28 12:59:29 +02:00
parent eff5ceea64
commit 6929d66ff2
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
View File

@@ -70,6 +70,8 @@ public:
void reloaded(); void reloaded();
QString idStringForObject(QObject *obj) const; QString idStringForObject(QObject *obj) const;
void sendMessage(const QByteArray &message);
public Q_SLOTS: public Q_SLOTS:
void selectedColorChanged(const QColor &color); void selectedColorChanged(const QColor &color);
void contextPathUpdated(const QStringList &contextPath); void contextPathUpdated(const QStringList &contextPath);

8
share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp
View File

@@ -236,4 +236,12 @@ QString QDeclarativeObserverService::idStringForObject(QObject *obj) const
return idString; return idString;
} }
void QDeclarativeObserverService::sendMessage(const QByteArray &message)
{
if (status() != Enabled)
return;
QDeclarativeDebugService::sendMessage(message);
}
} // namespace QmlJSDebugger } // namespace QmlJSDebugger