summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-03 08:43:00 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-03 08:43:00 (GMT)
commit348675876dfacb6cdd2373a1a4ae9d814e057df2 (patch)
tree192487075e60933b1db8a6dfc19ab155361f3deb /tools
parent0d037da6f4a7a7da7ad319265d7abbf41295e082 (diff)
downloadQt-348675876dfacb6cdd2373a1a4ae9d814e057df2.zip
Qt-348675876dfacb6cdd2373a1a4ae9d814e057df2.tar.gz
Qt-348675876dfacb6cdd2373a1a4ae9d814e057df2.tar.bz2
Really run image reader in its own thread.
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlviewer/qmlviewer.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 71ba81c..2b69d97 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -349,9 +349,9 @@ public:
QMutexLocker lock(&mutex);
QNetworkAccessManager *manager = new QNetworkAccessManager(parent);
if (!cookieJar)
- cookieJar = new PersistentCookieJar(this);
+ cookieJar = new PersistentCookieJar(manager);
manager->setCookieJar(cookieJar);
- cookieJar->setParent(this);
+ cookieJar->setParent(0);
setupProxy(manager);
if (cacheSize > 0) {
QNetworkDiskCache *cache = new QNetworkDiskCache;
@@ -405,7 +405,6 @@ public:
void setCacheSize(int size) {
if (size != cacheSize) {
cacheSize = size;
- invalidate();
}
}
@@ -691,7 +690,6 @@ void QmlViewer::showProxySettings()
void QmlViewer::proxySettingsChanged()
{
- namFactory->invalidate();
reload ();
}