summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-09-30 15:49:19 (GMT)
committerKai Koehne <kai.koehne@nokia.com>2010-09-30 15:52:20 (GMT)
commitcfe198948f1e4867918176df38b3e0b49757a4b8 (patch)
treecd4fa4b3dc0827df1bf920e3d8245b94ba9c7141 /src/declarative
parent3b43389b78925ce87d660c343c925fa280b91e11 (diff)
downloadQt-cfe198948f1e4867918176df38b3e0b49757a4b8.zip
Qt-cfe198948f1e4867918176df38b3e0b49757a4b8.tar.gz
Qt-cfe198948f1e4867918176df38b3e0b49757a4b8.tar.bz2
QDeclarativeDebug: Make autotests more robust
Always flush sockets after sending data, and make autotests more robust by using busy wait. Reviewed-by: Christiaan Janssen
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/debugger/qdeclarativedebugclient.cpp3
-rw-r--r--src/declarative/debugger/qdeclarativedebugservice.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index 5baaf70..977e58e 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -99,6 +99,7 @@ void QDeclarativeDebugConnectionPrivate::advertisePlugins()
QPacket pack;
pack << serverId << 1 << plugins.keys();
protocol->send(pack);
+ q->flush();
}
void QDeclarativeDebugConnectionPrivate::connected()
@@ -106,6 +107,7 @@ void QDeclarativeDebugConnectionPrivate::connected()
QPacket pack;
pack << serverId << 0 << protocolVersion << plugins.keys();
protocol->send(pack);
+ q->flush();
}
void QDeclarativeDebugConnectionPrivate::readyRead()
@@ -274,6 +276,7 @@ void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
QPacket pack;
pack << d->name << message;
d->client->d->protocol->send(pack);
+ d->client->d->q->flush();
}
void QDeclarativeDebugClient::statusChanged(Status)
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index 62f2f39..d2ef00d 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -142,6 +142,7 @@ void QDeclarativeDebugServerPrivate::advertisePlugins()
QPacket pack;
pack << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << plugins.keys();
protocol->send(pack);
+ connection->flush();
}
void QDeclarativeDebugServer::listen()