aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-07-23 15:59:20 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2018-07-24 10:34:24 +0000
commita4d3cf9c7d1f58da7ab99aa394d3acdff305caa6 (patch)
tree9263b1500478652f8bd95916fd70bc0be779ca75 /src/quick/doc
parenta5f1581653bf39938f052eb0138ba0e834266b0c (diff)
Doc: bump import version to 2.12
This is important since 2.12 is LTS and because Input Handlers are now included. Change-Id: I09417eb873ed7971fc768dddb916954d46091a6b Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/quick/doc')
-rw-r--r--src/quick/doc/src/concepts/effects/particles.qdoc6
-rw-r--r--src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc8
-rw-r--r--src/quick/doc/src/qmltypereference.qdoc6
3 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/doc/src/concepts/effects/particles.qdoc b/src/quick/doc/src/concepts/effects/particles.qdoc
index 59f9c0db83..452130a05b 100644
--- a/src/quick/doc/src/concepts/effects/particles.qdoc
+++ b/src/quick/doc/src/concepts/effects/particles.qdoc
@@ -26,14 +26,14 @@
****************************************************************************/
/*!
- \qmlmodule QtQuick.Particles 2.11
+ \qmlmodule QtQuick.Particles 2.12
\title Qt Quick Particles QML Types
\ingroup qmlmodules
\brief Provides QML types for particle effects
This QML module contains a particle system for Qt Quick. To use these types, import the module with the following line:
\code
- import QtQuick.Particles 2.11
+ import QtQuick.Particles 2.12
\endcode
For a simple overview of how the system can be used, see \l{Using the Qt Quick Particle System}.
@@ -50,7 +50,7 @@
Note that to use types from the particles module, you will need to import the types with the following line:
\code
- import QtQuick.Particles 2.11
+ import QtQuick.Particles 2.12
\endcode
\section1 The ParticleSystem
diff --git a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
index c8bdfa28cd..bac6ac8a52 100644
--- a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
+++ b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
@@ -198,8 +198,8 @@ so. To explain why, let's take a look at a simplified example.
Suppose we were writing the UI for a settings page:
\qml
- import QtQuick 2.11
- import QtQuick.Controls 2.4
+ import QtQuick 2.12
+ import QtQuick.Controls 2.12
Page {
Button {
@@ -297,8 +297,8 @@ into QML:
The QML then calls the C++ slot directly:
\qml
- import QtQuick 2.11
- import QtQuick.Controls 2.4
+ import QtQuick 2.12
+ import QtQuick.Controls 2.12
Page {
Button {
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index 80b9241f36..5d67232ae7 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
-\qmlmodule QtQuick 2.11
+\qmlmodule QtQuick 2.12
\title Qt Quick QML Types
\ingroup qmlmodules
\brief Provides graphical QML types.
@@ -34,11 +34,11 @@
The \l{Qt Quick} module provides graphical primitive types. These types 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.11, and thus it may be
+The current version of the \c QtQuick module is version 2.12, and thus it may be
imported via the following statement:
\qml
-import QtQuick 2.11
+import QtQuick 2.12
\endqml
Visit the \l {Qt Quick} module documentation for more