Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
  Fix compile error on mingw.
  MONILITY-645
  Do not override alternate background color in Plastique
  Fix QComboBox ignoring foreground role in some styles
  Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
  Fix compilation with Sun CC:
  Ensure that we return QPair<long,long> in all cases.
  Update PLATFORM(SPARC64) to CPU(SPARC64)
  jui files are no c++ ...
  scan some more file types by default
  Support EtchDisabledText with spin box on Windows style
  QNAM HTTP: Fix invoking a method when being destructed right now
  Fixed a typo in the QDoubleValidotor doc.
  Trivial fix to JavaScriptCore to fix building with MSVC 2010
  Autotest: oops, fix oops: remove qguard from auto.pro
  Autotests: oops, remove last traces of QGuard
  Remove QGuard.
  Unskip test that used to crash
  QtScript: Add yet more missing API shims
  QtScript: Make sure the old identifier table is restored
  ...

1 files changed, 6 insertions, 3 deletions

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 82bc14f..86ee088 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -648,7 +648,8 @@ void QHttpNetworkConnectionChannel::allDone()
             close();
         QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
     } else if (alreadyPipelinedRequests.isEmpty()) {
-        QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+        if (qobject_cast<QHttpNetworkConnection*>(connection))
+            QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
     }
 }
 
@@ -753,7 +754,8 @@ void QHttpNetworkConnectionChannel::handleStatus()
         }
         break;
     default:
-        QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+        if (qobject_cast<QHttpNetworkConnection*>(connection))
+            QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
     }
 }
 
@@ -801,7 +803,8 @@ void QHttpNetworkConnectionChannel::closeAndResendCurrentRequest()
     requeueCurrentlyPipelinedRequests();
     close();
     resendCurrent = true;
-    QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+    if (qobject_cast<QHttpNetworkConnection*>(connection))
+        QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
 }
 
 bool QHttpNetworkConnectionChannel::isSocketBusy() const