From: Martin Jones <martin.jones@nokia.com>
Date: Tue, 31 May 2011 05:34:37 +0000 (+1000)
Subject: Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=3f5a0e123f662e39a10d598a8d7de12c7ff17f69;p=konrad%2Fqtdeclarative.git

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative

Conflicts:
	src/declarative/debugger/qpacketprotocol.cpp

Change-Id: I61f500a08ce73def34c093344bfdad44a6c9a6f1
---

3f5a0e123f662e39a10d598a8d7de12c7ff17f69
diff --cc src/declarative/debugger/qpacketprotocol.cpp
index c24df61,3fbe804..a40a9ab
--- a/src/declarative/debugger/qpacketprotocol.cpp
+++ b/src/declarative/debugger/qpacketprotocol.cpp
@@@ -164,47 -163,44 +164,43 @@@ public Q_SLOTS
  
      void readyToRead()
      {
-         if(-1 == inProgressSize) {
-             // We need a size header of sizeof(qint32)
-             if(sizeof(qint32) > (uint)dev->bytesAvailable())
-                 return;
- 
-             // Read size header
-             int read = dev->read((char *)&inProgressSize, sizeof(qint32));
-             Q_ASSERT(read == sizeof(qint32));
-             Q_UNUSED(read);
- 
-             // Check sizing constraints
-             if(inProgressSize > maxPacketSize) {
-                 QObject::disconnect(dev, SIGNAL(readyRead()),
-                                     this, SLOT(readyToRead()));
-                 QObject::disconnect(dev, SIGNAL(aboutToClose()),
-                                     this, SLOT(aboutToClose()));
-                 QObject::disconnect(dev, SIGNAL(bytesWritten(qint64)),
-                                     this, SLOT(bytesWritten(qint64)));
-                 dev = 0;
-                 emit invalidPacket();
-                 return;
-             }
- 
-             inProgressSize -= sizeof(qint32);
- 
+         while (true) {
              // Need to get trailing data
-             readyToRead();
-         } else {
-             inProgress.append(dev->read(inProgressSize - inProgress.size()));
- 
-             if(inProgressSize == inProgress.size()) {
-                 // Packet has arrived!
-                 packets.append(inProgress);
-                 inProgressSize = -1;
-                 inProgress.clear();
- 
-                 emit readyRead();
-                 waitingForPacket = false;
- 
-                 // Need to get trailing data
-                 readyToRead();
+             if (-1 == inProgressSize) {
+                 // We need a size header of sizeof(qint32)
+                 if (sizeof(qint32) > (uint)dev->bytesAvailable())
+                     return;
+ 
+                 // Read size header
+                 int read = dev->read((char *)&inProgressSize, sizeof(qint32));
+                 Q_ASSERT(read == sizeof(qint32));
+                 Q_UNUSED(read);
+ 
+                 // Check sizing constraints
+                 if (inProgressSize > maxPacketSize) {
+                     QObject::disconnect(dev, SIGNAL(readyRead()),
+                                         this, SLOT(readyToRead()));
+                     QObject::disconnect(dev, SIGNAL(aboutToClose()),
+                                         this, SLOT(aboutToClose()));
+                     QObject::disconnect(dev, SIGNAL(bytesWritten(qint64)),
+                                         this, SLOT(bytesWritten(qint64)));
+                     dev = 0;
+                     emit invalidPacket();
+                     return;
+                 }
+ 
+                 inProgressSize -= sizeof(qint32);
+             } else {
+                 inProgress.append(dev->read(inProgressSize - inProgress.size()));
+ 
+                 if (inProgressSize == inProgress.size()) {
+                     // Packet has arrived!
+                     packets.append(inProgress);
+                     inProgressSize = -1;
+                     inProgress.clear();
 -
+                     emit readyRead();
+                 } else
+                     return;
              }
          }
      }