diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-10 14:28:21 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-14 11:00:53 +0000 |
| commit | 171f8fd1e3c4fb9944f3ecae7b3faaa0431e538a (patch) | |
| tree | fd73d91a5917ad0cfcc895f36949436243a8733e /src | |
| parent | 219c80b3297ba5f5851152d2414d64b3b4e49676 (diff) | |
Link to JavaScript Environment Restrictions doc from Global Object docs
I added the note to the global object documentation in 81dad6e, but I
wasn't aware that a more detailed section existed elsewhere.
Change-Id: I2b8c1c6ade0d9f27d489a246839ade89ee868a28
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/doc/src/javascript/qmlglobalobject.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/javascript/qmlglobalobject.qdoc b/src/qml/doc/src/javascript/qmlglobalobject.qdoc index 57259ec27d..50374f4583 100644 --- a/src/qml/doc/src/javascript/qmlglobalobject.qdoc +++ b/src/qml/doc/src/javascript/qmlglobalobject.qdoc @@ -46,8 +46,8 @@ additional imports: \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()}). +the global object of a \l QQmlEngine. For more information about this, see +\l {JavaScript Environment Restrictions}. \keyword XMLHttpRequest \section1 XMLHttpRequest |