aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorXizhi Zhu (Steven) <xizhi.zhu@gmail.com>2012-01-25 14:26:23 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-25 21:40:31 +0100
commitb275989fb8ea44f00afbb56698ef8a42856948d7 (patch)
tree47422991c0ba214773693c408fee08fe01f66f90 /src/declarative
parentd63c6368879d6f46d9a70e9f91fc31612710c054 (diff)
Remove the work-around for avoiding possible deadlock.
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>
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index ade01cfe89..d92378ee6a 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -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;