diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-03 08:46:42 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-03 08:46:42 (GMT) |
| commit | 3838762e4b572017efc42e9f7dbfc43d262807cf (patch) | |
| tree | ebd9533ac4474c254be3acd8ebdc92ba9b0a390d /src/declarative/qml/qmlengine_p.h | |
| parent | 348675876dfacb6cdd2373a1a4ae9d814e057df2 (diff) | |
| parent | 8003041739f2ec101bf8198f6a53375ce0112eb1 (diff) | |
| download | Qt-3838762e4b572017efc42e9f7dbfc43d262807cf.zip Qt-3838762e4b572017efc42e9f7dbfc43d262807cf.tar.gz Qt-3838762e4b572017efc42e9f7dbfc43d262807cf.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
| -rw-r--r-- | src/declarative/qml/qmlengine_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index ddb25a0..6aa5d69 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -108,8 +108,7 @@ class QmlScriptEngine : public QScriptEngine { public: QmlScriptEngine(QmlEnginePrivate *priv); - - ~QmlScriptEngine(); + virtual ~QmlScriptEngine(); QUrl resolvedUrl(QScriptContext *context, const QUrl& url); // resolved against p's context, or baseUrl if no p static QScriptValue resolvedUrl(QScriptContext *ctxt, QScriptEngine *engine); @@ -127,6 +126,8 @@ public: QScriptClass *nodeListClass; QUrl baseUrl; + + virtual QNetworkAccessManager *networkAccessManager(); }; class Q_AUTOTEST_EXPORT QmlEnginePrivate : public QObjectPrivate @@ -209,6 +210,8 @@ public: QmlComponentAttached *componentAttacheds; bool inBeginCreate; + + QNetworkAccessManager *getNetworkAccessManager() const; mutable QNetworkAccessManager *networkAccessManager; mutable QmlNetworkAccessManagerFactory *networkAccessManagerFactory; |