summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine_p.h
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2010-01-29 03:01:49 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2010-01-29 03:01:49 (GMT)
commit5cf8677758e6fbfa5bf360c73519c14630db808c (patch)
treeb92c5b97561ef875c08397bb8b4b925007f557a6 /src/declarative/qml/qmlengine_p.h
parentb91871a108638a5a136ac2a4310f5a3743320f72 (diff)
parent430f3ba46d3db10f7b4534f74e65d2ca13b23747 (diff)
downloadQt-5cf8677758e6fbfa5bf360c73519c14630db808c.zip
Qt-5cf8677758e6fbfa5bf360c73519c14630db808c.tar.gz
Qt-5cf8677758e6fbfa5bf360c73519c14630db808c.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
-rw-r--r--src/declarative/qml/qmlengine_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 85e8c80..6f62b40 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -92,6 +92,7 @@ class QmlValueTypeScriptClass;
class QScriptEngineDebugger;
class QNetworkReply;
class QNetworkAccessManager;
+class QmlNetworkAccessManagerFactory;
class QmlAbstractBinding;
class QScriptDeclarativeClass;
class QmlTypeNameScriptClass;
@@ -209,6 +210,8 @@ public:
bool inBeginCreate;
mutable QNetworkAccessManager *networkAccessManager;
+ mutable QmlNetworkAccessManagerFactory *networkAccessManagerFactory;
+ mutable bool accessManagerValid;
QmlCompositeTypeManager typeManager;
QStringList fileImportPath;