aboutsummaryrefslogtreecommitdiffstats
path: root/doc/src/qml/network.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/qml/network.qdoc')
-rw-r--r--doc/src/qml/network.qdoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/qml/network.qdoc b/doc/src/qml/network.qdoc
index 15a17203c3..71f42a4bfe 100644
--- a/doc/src/qml/network.qdoc
+++ b/doc/src/qml/network.qdoc
@@ -118,11 +118,11 @@ See the \tt examples/declarative/flickr for a real demonstration of this.
\section1 Configuring the Network Access Manager
-All network access from QML is managed by a QNetworkAccessManager set on the QDeclarativeEngine which executes the QML.
+All network access from QML is managed by a QNetworkAccessManager set on the QQmlEngine which executes the QML.
By default, this is an unmodified Qt QNetworkAccessManager. You may set a different manager by
-providing a QDeclarativeNetworkAccessManagerFactory and setting it via
-QDeclarativeEngine::setNetworkAccessManagerFactory().
-For example, the \l {QML Viewer} sets a QDeclarativeNetworkAccessManagerFactory which
+providing a QQmlNetworkAccessManagerFactory and setting it via
+QQmlEngine::setNetworkAccessManagerFactory().
+For example, the \l {QML Viewer} sets a QQmlNetworkAccessManagerFactory which
creates QNetworkAccessManager that trusts HTTP Expiry headers to avoid network cache checks,
allows HTTP Pipelining, adds a persistent HTTP CookieJar, a simple disk cache, and supports proxy settings.
@@ -134,7 +134,7 @@ the executable using \l{The Qt Resource System}. Using this, an executable can r
that is compiled into the executable:
\code
- QDeclarativeView *canvas = new QDeclarativeView;
+ QQuickView *canvas = new QQuickView;
canvas->setUrl(QUrl("qrc:/dial.qml"));
\endcode