diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-02 09:58:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-02 10:32:33 +0200 |
| commit | 41e924eb6e1c690bc81d095fc5e8f57244aae964 (patch) | |
| tree | b459dfa150530443901be68471df88c69ca7a7d4 /src/quick/doc/src/qmltypereference.qdoc | |
| parent | d51afdb74fdcb9a5c7e1fdaa763325c78d794d06 (diff) | |
| parent | 87a5889029aed8c53a4b02a42804d036614db36b (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
examples/quick/scenegraph/openglunderqml/squircle.h
src/quick/doc/src/qmltypereference.qdoc
src/quick/scenegraph/qsgthreadedrenderloop.cpp
Change-Id: Ife4f4b897044a7ffcd0710493c6aed1d87cf1ef9
Diffstat (limited to 'src/quick/doc/src/qmltypereference.qdoc')
| -rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index 3f9de28c9d..6887fefd98 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -42,11 +42,11 @@ by this module, organized according to category and purpose. The types provided by the \l {Qt Quick} module are only available in a QML document if that document imports the \c QtQuick namespace. -The current version of the \c QtQuick module is version 2.2, and thus it may be +The current version of the \c QtQuick module is version 2.3, and thus it may be imported via the following statement: \qml -import QtQuick 2.2 +import QtQuick 2.3 \endqml See the \l {Qt Quick} module documentation for more @@ -321,13 +321,13 @@ set of Particle System types for Qt Quick 2 */ /*! -\qmlmodule QtQuick 2.2 +\qmlmodule QtQuick 2.3 \title Qt Quick QML Types \brief This module provides graphical primitives for use in QML. The \l{Qt Quick} module provides graphical primitive types. They can be used with the following import \code -import QtQuick 2.2 +import QtQuick 2.3 \endcode For a more detailed listing of types in the \c {QtQuick} import, see the \l{Qt Quick QML Types} page. |