diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-10-01 13:03:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 14:40:01 +0200 |
| commit | 4706b1ceff9af9141044ed3cf020ce5624bfa40f (patch) | |
| tree | 43672217a945512ddd1704468d1fd4b6e9c153c7 /src/qml/doc/src/javascript/imports.qdoc | |
| parent | 4f50ab594aa2fb1d38981127beca634ad3396489 (diff) | |
qdoc: no longer recognizes the version nr in QML refs
All QML references of the form
<QML-module-name><QML-module-version>::<QML-type>::<member-name> have
had the <QML-module-version> removed i.
Task-number: QTBUG-33776
Change-Id: Idde279e0f254cd24ea44f9841662dd81a2c5bbc6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/doc/src/javascript/imports.qdoc')
| -rw-r--r-- | src/qml/doc/src/javascript/imports.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/doc/src/javascript/imports.qdoc b/src/qml/doc/src/javascript/imports.qdoc index 809b74ed52..fa9aa9794c 100644 --- a/src/qml/doc/src/javascript/imports.qdoc +++ b/src/qml/doc/src/javascript/imports.qdoc @@ -125,14 +125,14 @@ When a JavaScript file is imported, it must be imported with a qualifier. The functions in that file are then accessible from the importing script via the qualifier (that is, as \tt{Qualifier.functionName(params)}). Sometimes it is desirable to have the functions made available in the importing context without -needing to qualify them, and in this circumstance the \l{QtQml2::Qt::include()} +needing to qualify them, and in this circumstance the \l{QtQml::Qt::include()} {Qt.include()} function may be used to include one JavaScript file from another. This copies all functions from the other file into the current file's namespace, but ignores all pragmas and imports defined in that file. For example, the QML code below left calls \c showCalculations() in \c script.js, which in turn can call \c factorial() in \c factorial.js, as it has included -\c factorial.js using \l {QtQml2::Qt::include()}{Qt.include()}. +\c factorial.js using \l {QtQml::Qt::include()}{Qt.include()}. \table \row @@ -142,7 +142,7 @@ which in turn can call \c factorial() in \c factorial.js, as it has included \li \snippet qml/integrating-javascript/includejs/factorial.js 0 \endtable -Notice that calling \l {QtQml2::Qt::include()}{Qt.include()} copies all functions +Notice that calling \l {QtQml::Qt::include()}{Qt.include()} copies all functions from \c factorial.js into the \c MyScript namespace, which means the QML component can also access \c factorial() directly as \c MyScript.factorial(). |