diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-17 18:08:53 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-20 12:08:27 +0200 |
commit | 5931caca23709ed0b2583ca2fd268191d06a23ef (patch) | |
tree | 2519bd7dbce469e1ce185faaeb6bef481cade227 /examples/qml/networkaccessmanagerfactory | |
parent | 7da45b21b76965e021e8a049715b1dee34081f7c (diff) | |
parent | 2556b97ab22cfde606d2b77d6e816fd282741291 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Change-Id: I272074fa2ca259439cae2f686325932f7f9d7c01
Diffstat (limited to 'examples/qml/networkaccessmanagerfactory')
-rw-r--r-- | examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc b/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc index ccb05917a8..84ad077a17 100644 --- a/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc +++ b/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc @@ -26,8 +26,9 @@ ****************************************************************************/ /*! - \title C++ Extensions: Network Access Manager Factory Example \example networkaccessmanagerfactory + \title C++ Extensions: Network Access Manager Factory Example + \brief Implements a custom network access manager for the QML engine This example shows how to use QQmlNetworkAccessManagerFactory to create a QNetworkAccessManager with a proxy. |