Remove the work-around for avoiding possible deadlock.
authorXizhi Zhu (Steven) <xizhi.zhu@gmail.com>
Wed, 25 Jan 2012 13:26:23 +0000 (14:26 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 25 Jan 2012 20:40:31 +0000 (21:40 +0100)
The possible deadlock has been fixed by:
http://codereview.qt-project.org/#change,13989

Change-Id: I1238052d4452ac37dedf8939fa27c8c8f6536f16
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
src/declarative/qml/qdeclarativeengine.cpp

index ade01cf..d92378e 100644 (file)
@@ -423,12 +423,6 @@ void QDeclarativeEnginePrivate::init()
 
     static bool firstTime = true;
     if (firstTime) {
-        // This is a nasty hack as QNetworkAccessManager will issue a 
-        // BlockingQueuedConnection to the main thread if it is initialized for the
-        // first time on a non-main thread.  This can cause a lockup if the main thread
-        // is blocking on the thread that initialize the network access manager.
-        QNetworkConfigurationManager man;
-
         qmlRegisterType<QDeclarativeComponent>("QML", 1, 0, "Component");
 
         firstTime = false;