summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-08-04 15:22:58 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-04 15:22:58 (GMT)
commit26218170746d36b866ae80c8f4418f5592121eb6 (patch)
treec2dda428165370cecf858bf22ab43dd1189ec4bf
parenta214bb99775e898fd9233b932f08ff91a57fc053 (diff)
downloadQt-26218170746d36b866ae80c8f4418f5592121eb6.zip
Qt-26218170746d36b866ae80c8f4418f5592121eb6.tar.gz
Qt-26218170746d36b866ae80c8f4418f5592121eb6.tar.bz2
QDeclarativeDebug: use QueuedConnection in the packet protocol
Else, we can have deadlock in the javascript debugger, which may start an event loop. If the javascript execution result from some network command, the further network command are not processed more (the ones that exist the javascript debugger event loop) Having a QueuedConnection there means the network events will not be blocked by a rentrency in the event loop Reviewed-by: Lasse Holmstedt
-rw-r--r--src/declarative/debugger/qpacketprotocol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp
index 878f42f..c2f7709 100644
--- a/src/declarative/debugger/qpacketprotocol.cpp
+++ b/src/declarative/debugger/qpacketprotocol.cpp
@@ -125,7 +125,7 @@ public:
QObject::connect(this, SIGNAL(invalidPacket()),
parent, SIGNAL(invalidPacket()));
QObject::connect(dev, SIGNAL(readyRead()),
- this, SLOT(readyToRead()));
+ this, SLOT(readyToRead()), Qt::QueuedConnection);
QObject::connect(dev, SIGNAL(aboutToClose()),
this, SLOT(aboutToClose()));
QObject::connect(dev, SIGNAL(bytesWritten(qint64)),