summaryrefslogtreecommitdiff
path: root/src/layouts
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-10-01 17:17:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-02 10:19:59 +0200
commitd6e56b145c96a0bfc988aa65d6ace20080392857 (patch)
tree8aa4cfd8179c0f1b00525c3dce0388d0026678ee /src/layouts
parent503291baa06064e86326267c89ce803f30e29dc5 (diff)
downloadqtquickcontrols-d6e56b145c96a0bfc988aa65d6ace20080392857.tar.gz
Doc: Moved \inqmlmodule version to \qmlmodule for QtQuick.Layouts
-QDoc uses \qmlmodule as the import statement and the version in \inqmlmodule is not needed. -used QtQuick.Layouts 1.1 for Qt 5.2 Task-number: QTBUG-32172 Change-Id: I5f9b1ba252e86d30b10a70878c4800d28e92b42a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/layouts')
-rw-r--r--src/layouts/doc/src/qtquicklayouts-overview.qdoc2
-rw-r--r--src/layouts/doc/src/qtquicklayouts.qdoc4
-rw-r--r--src/layouts/qquicklayout.cpp2
-rw-r--r--src/layouts/qquicklinearlayout.cpp6
4 files changed, 7 insertions, 7 deletions
diff --git a/src/layouts/doc/src/qtquicklayouts-overview.qdoc b/src/layouts/doc/src/qtquicklayouts-overview.qdoc
index 3eeb98d2..0a4480f7 100644
--- a/src/layouts/doc/src/qtquicklayouts-overview.qdoc
+++ b/src/layouts/doc/src/qtquicklayouts-overview.qdoc
@@ -38,7 +38,7 @@
The QML types can be imported into your application using the following import statement in your \c {.qml} file.
\code
- import QtQuick.Layouts 1.0
+ import QtQuick.Layouts 1.1
\endcode
\section1 Key Features
diff --git a/src/layouts/doc/src/qtquicklayouts.qdoc b/src/layouts/doc/src/qtquicklayouts.qdoc
index b03ff69b..99d14e86 100644
--- a/src/layouts/doc/src/qtquicklayouts.qdoc
+++ b/src/layouts/doc/src/qtquicklayouts.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \qmlmodule QtQuick.Layouts 1
+ \qmlmodule QtQuick.Layouts 1.1
\title Qt Quick Layouts QML Types
\ingroup qmlmodules
\brief Provides QML types for arranging QML items in a user interface.
@@ -40,7 +40,7 @@
following import statement in your .qml file.
\code
- import QtQuick.Layouts 1.0
+ import QtQuick.Layouts 1.1
\endcode
*/
diff --git a/src/layouts/qquicklayout.cpp b/src/layouts/qquicklayout.cpp
index 0cfe61b7..7eb2f8ea 100644
--- a/src/layouts/qquicklayout.cpp
+++ b/src/layouts/qquicklayout.cpp
@@ -48,7 +48,7 @@
/*!
\qmltype Layout
\instantiates QQuickLayoutAttached
- \inqmlmodule QtQuick.Layouts 1.1
+ \inqmlmodule QtQuick.Layouts
\ingroup layouts
\brief Provides attached properties for items pushed onto a \l GridLayout,
\l RowLayout or \l ColumnLayout.
diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp
index fd6ffd69..3909664d 100644
--- a/src/layouts/qquicklinearlayout.cpp
+++ b/src/layouts/qquicklinearlayout.cpp
@@ -49,7 +49,7 @@
\qmltype RowLayout
\instantiates QQuickRowLayout
\inherits Item
- \inqmlmodule QtQuick.Layouts 1.1
+ \inqmlmodule QtQuick.Layouts
\ingroup layouts
\brief Identical to \l GridLayout, but having only one row.
@@ -78,7 +78,7 @@
\qmltype ColumnLayout
\instantiates QQuickColumnLayout
\inherits Item
- \inqmlmodule QtQuick.Layouts 1.1
+ \inqmlmodule QtQuick.Layouts
\ingroup layouts
\brief Identical to \l GridLayout, but having only one column.
@@ -109,7 +109,7 @@
\qmltype GridLayout
\instantiates QQuickGridLayout
\inherits Item
- \inqmlmodule QtQuick.Layouts 1.1
+ \inqmlmodule QtQuick.Layouts
\ingroup layouts
\brief Provides a way of dynamically arranging items in a grid.