From 551cb80abf98db21a8fa1a3616f2b44d33a6288e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 18 Apr 2018 16:25:33 +0200 Subject: Document latest QtQuick.Layouts import to be 2.11 Since commit 214fbaa57b73296a0 the latest minor version of the import is automatically the Qt minor version, so let's also document this. Change-Id: I4131a399cca7c66b0e9df549f14be43eeaa94af3 Reviewed-by: Simon Hausmann --- src/imports/layouts/layouts.pro | 2 +- src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc | 2 +- src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/imports/layouts/layouts.pro b/src/imports/layouts/layouts.pro index 26574150de..addf396746 100644 --- a/src/imports/layouts/layouts.pro +++ b/src/imports/layouts/layouts.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qquicklayoutsplugin TARGETPATH = QtQuick/Layouts -IMPORT_VERSION = 1.2 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION QT *= qml-private quick-private gui-private core-private diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc index 06ebe2d3d1..a5f93b972a 100644 --- a/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc +++ b/src/quick/doc/src/concepts/layouts/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.2 + import QtQuick.Layouts 1.11 \endcode \section1 Key Features diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc index 8f390c83db..d82e35fb93 100644 --- a/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc +++ b/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule QtQuick.Layouts 1.3 + \qmlmodule QtQuick.Layouts 1.11 \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.3 + import QtQuick.Layouts 1.11 \endcode */ -- cgit v1.2.3