diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-09 14:57:54 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-09 13:32:56 +0000 |
| commit | 81dad6eb2b58314c10af2ba40abceab974c7e80f (patch) | |
| tree | 6018031f41f3d42183c408280a1af46d78a0237a /src | |
| parent | 67fa94aee26a01a81f47ad3e2876f345b10aca44 (diff) | |
Document that modifying the globalObject of QQmlEngine is not supported
Change-Id: I62feb04ae26b6988c6e392b27bd1c3b7f630fd57
Task-number: QTBUG-48175
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/doc/src/javascript/qmlglobalobject.qdoc | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/doc/src/javascript/qmlglobalobject.qdoc b/src/qml/doc/src/javascript/qmlglobalobject.qdoc index e37b35451c..57259ec27d 100644 --- a/src/qml/doc/src/javascript/qmlglobalobject.qdoc +++ b/src/qml/doc/src/javascript/qmlglobalobject.qdoc @@ -45,7 +45,9 @@ additional imports: \li \l{XMLHttpRequest}, DOMException: These objects implement a subset of the \l{http://www.w3.org/TR/XMLHttpRequest/}{W3C XMLHttpRequest specification}. \endlist - +\note The \l {QJSEngine::}{globalObject()} function cannot be used to modify +the global object of a \l QQmlEngine by setting properties on it +(via \l {QJSValue::}{setProperty()}). \keyword XMLHttpRequest \section1 XMLHttpRequest diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index ffc890a2cf..729bf8e03b 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -912,7 +912,7 @@ QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine() Note that the \l {Qt Quick 1} version is called QDeclarativeEngine. - \sa QQmlComponent, QQmlContext + \sa QQmlComponent, QQmlContext, {QML Global Object} */ /*! |