diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-27 01:00:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-27 01:00:20 +0200 |
| commit | e282db62b1fca2ea133162bc6254595a42f4b861 (patch) | |
| tree | afb0bb98f19153e25f7f3c6b200d579e731baeae /src/qml/qml/qqmlengine.cpp | |
| parent | 1b30e8f94cc15352583e8e1f27139676683f62af (diff) | |
| parent | 2f397aa15a13efbadf6c1bc378bb134ac1e655c5 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I280d42b8926c0cada1f35d322b80aaf2b0ef0a73
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 1ae39423e9..d62d91456f 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1205,6 +1205,8 @@ void QQmlEnginePrivate::registerFinalizeCallback(QObject *obj, int index) support. The factory must be set before executing the engine. + + \note QQmlEngine does not take ownership of the factory. */ void QQmlEngine::setNetworkAccessManagerFactory(QQmlNetworkAccessManagerFactory *factory) { |