diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2010-09-30 13:26:05 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-04 04:51:14 (GMT) |
| commit | 000a95629a4dd07b600b5ae4d463654f8d2267af (patch) | |
| tree | fcc159352d864a3a904707132c9db0ff6ad84870 /src/declarative/debugger | |
| parent | b4ccec4309f9d384056e743e9c0caf91097a57b4 (diff) | |
| download | Qt-000a95629a4dd07b600b5ae4d463654f8d2267af.zip Qt-000a95629a4dd07b600b5ae4d463654f8d2267af.tar.gz Qt-000a95629a4dd07b600b5ae4d463654f8d2267af.tar.bz2 | |
QDeclarativeDebugClient: Make sure status is consistent
When statusChanged() is called during handsake state() was not the same
as the argument passed. Fix this by setting gotHello = true _before_
notifying the clients.
Reviewed-by: Christiaan Janssen
Task-number: QTBUG-14087
(cherry picked from commit a1f050fe4217d3a642ab7f4df8e50c21aa51689c)
Diffstat (limited to 'src/declarative/debugger')
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugclient.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp index ce3faf6..5baaf70 100644 --- a/src/declarative/debugger/qdeclarativedebugclient.cpp +++ b/src/declarative/debugger/qdeclarativedebugclient.cpp @@ -136,7 +136,7 @@ void QDeclarativeDebugConnectionPrivate::readyRead() return; } - qDebug() << "Available server side plugins: " << serverPlugins; + gotHello = true; QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin(); for (; iter != plugins.end(); ++iter) { @@ -145,7 +145,6 @@ void QDeclarativeDebugConnectionPrivate::readyRead() newStatus = QDeclarativeDebugClient::Enabled; iter.value()->statusChanged(newStatus); } - gotHello = true; } while (protocol->packetsAvailable()) { |