diff options
-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} */ /*! |