diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-09-24 16:58:35 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-27 12:31:01 +0200 |
commit | 1ef957834bf9040ccd001fa6d80e483b9b21452c (patch) | |
tree | 7a3d8b4f14c071152e818089c4c7cf127ec61e5e /src/qml/qml/qqmlengine.cpp | |
parent | 6ce4772473fd3695e8320c06e90061d58233d52c (diff) |
Doc: Updated imports, \qmlmodule, and \inqmlmodule versions in src/qml.
-QDoc ignores the version in \inqmlmodule so its better to remove them
to avoid confusion.
-Qt QML import version is 2.2 for 5.2 release
-Qt Quick import version is 2.2 for 5.2 release
Task-number: QTBUG-32172
Change-Id: I15df270f1fb4df0476a9ddd854fb9ddf58e9fc7c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 2f873936e3..c8b602e48e 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -121,7 +121,7 @@ void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor) /*! \qmltype QtObject \instantiates QObject - \inqmlmodule QtQml 2 + \inqmlmodule QtQml \ingroup qml-utility-elements \brief A basic QML type @@ -275,7 +275,7 @@ QQmlImageProviderBase::~QQmlImageProviderBase() /*! \qmltype Qt -\inqmlmodule QtQml 2 +\inqmlmodule QtQml \instantiates QQmlEnginePrivate \ingroup qml-utility-elements \keyword QmlGlobalQtObject |