diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:41:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:41:35 +0200 |
commit | 4653217c3f36e7914f2cc0573347a078dd11768f (patch) | |
tree | 7c7e862bdec55ae7ea0e2b6816bda189febbe4d1 /src/qml/doc | |
parent | c5dcabeb6a07ed358e64f26cd8475bfe5daae0e4 (diff) | |
parent | ad125bd18ef5c98a264b9e4fac258dd07511035d (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quickwidgets/qquickwidget.cpp
Change-Id: I3e2326bc86a9d3adaafbe3830b75ce9afa81c45b
Diffstat (limited to 'src/qml/doc')
-rw-r--r-- | src/qml/doc/src/javascript/qmlglobalobject.qdoc | 4 | ||||
-rw-r--r-- | src/qml/doc/src/qtqml.qdoc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/doc/src/javascript/qmlglobalobject.qdoc b/src/qml/doc/src/javascript/qmlglobalobject.qdoc index c9e018525a..b3d8a2b2a5 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. For more information about this, see +\l {JavaScript Environment Restrictions}. \target XMLHttpRequest \section1 XMLHttpRequest diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc index 64d6bb9ac4..33bb0c0750 100644 --- a/src/qml/doc/src/qtqml.qdoc +++ b/src/qml/doc/src/qtqml.qdoc @@ -106,8 +106,8 @@ JavaScript expressions allow QML code to contain application logic. Qt QML provides the framework for running JavaScript expressions in QML and from C++. These sections are from \l{The QML Reference}. -\l{qtqml-javascript-topic.html}{Integrating QML and JavaScript} \list + \li \l{qtqml-javascript-topic.html}{Integrating QML and JavaScript} \li \l{qtqml-javascript-expressions.html}{Using JavaScript Expressions with QML} \li \l{qtqml-javascript-dynamicobjectcreation.html}{Dynamic QML Object Creation from JavaScript} \li \l{qtqml-javascript-resources.html}{Defining JavaScript Resources In QML} @@ -140,8 +140,6 @@ Further information for writing QML applications: - essential information for application development with QML and Qt Quick \li \l{Qt Quick} - a module which provides a set of QML types and C++ classes for building user interfaces and applications with QML -\li \l{Qt QML Release Notes} - list of changes and - additions in the Qt QML module \endlist \section2 Reference |