diff options
Diffstat (limited to 'src/qml/doc/src')
| -rw-r--r-- | src/qml/doc/src/javascript/dynamicobjectcreation.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/functionlist.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/qmlfunctions.qdoc | 12 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc index acd7188db7..fffa783851 100644 --- a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc +++ b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc @@ -143,7 +143,7 @@ If the string of QML imports files using relative paths, the path should be relative to the file in which the parent object (the second argument to the method) is defined. -\important When building static QML applications, which is enforced on platforms like iOS, +\important When building static QML applications, QML files are scanned to detect import dependencies. That way, all necessary plugins and resources are resolved at compile time. However, only explicit import statements are considered (those found at diff --git a/src/qml/doc/src/javascript/functionlist.qdoc b/src/qml/doc/src/javascript/functionlist.qdoc index b9a25a2440..f5b1ed3cf1 100644 --- a/src/qml/doc/src/javascript/functionlist.qdoc +++ b/src/qml/doc/src/javascript/functionlist.qdoc @@ -143,6 +143,8 @@ \li toLocaleString() \li concat([item1 [, item2 [, ...]]]) \li join(separator) + \li find(callbackfn [, thisArg]) // ECMAScript 6: Added in Qt 5.9 + \li findIndex(callbackfn [, thisArg]) // ECMAScript 6: Added in Qt 5.9 \li pop() \li push([item1 [, item2 [, ...]]]) \li reverse() diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index 8b24d19891..a03c382ed5 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -544,3 +544,15 @@ in order to be found. */ +/*! + \since 5.9 + \fn void qmlRegisterModule(const char* uri, int versionMajor, int versionMinor); + \relates QQmlEngine + + This function registers a module in a particular \a uri with a version specified + in \a versionMajor and \a versionMinor. + + This can be used to make a certain module version available, even if no types + are registered for that version. This is particularly useful for keeping the + versions of related modules in sync. +*/ |