aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-04-18 15:58:09 +0200
committerKai Koehne <kai.koehne@qt.io>2018-04-20 06:45:32 +0000
commit017bd28f5f3854d0f4ad62a80630f08387bca9f6 (patch)
tree70104985cba1a57311e7e55f49c5996a87797bf7
parent1bc0593547218cc59ed8c0e34c559df2a4d2a313 (diff)
Document latest QtQml.Models import version 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: Ife465afc101d400b47e9f98c58cac3894224da00 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/imports/models/models.pro2
-rw-r--r--src/imports/models/plugin.cpp4
-rw-r--r--src/imports/models/plugins.qmltypes11
3 files changed, 13 insertions, 4 deletions
diff --git a/src/imports/models/models.pro b/src/imports/models/models.pro
index c94ba833ad..fc87533cea 100644
--- a/src/imports/models/models.pro
+++ b/src/imports/models/models.pro
@@ -1,7 +1,7 @@
CXX_MODULE = qml
TARGET = modelsplugin
TARGETPATH = QtQml/Models.2
-IMPORT_VERSION = 2.3
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
SOURCES += \
plugin.cpp
diff --git a/src/imports/models/plugin.cpp b/src/imports/models/plugin.cpp
index fb1d42e85e..83f8597408 100644
--- a/src/imports/models/plugin.cpp
+++ b/src/imports/models/plugin.cpp
@@ -52,7 +52,7 @@ static void initResources()
QT_BEGIN_NAMESPACE
/*!
- \qmlmodule QtQml.Models 2.2
+ \qmlmodule QtQml.Models 2.11
\title Qt QML Models QML Types
\ingroup qmlmodules
\brief Provides QML types for data models
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
To use the types in this module, import the module with the following line:
\code
- import QtQml.Models 2.2
+ import QtQml.Models 2.11
\endcode
Note that QtQml.Models module started at version 2.1 to match the version
diff --git a/src/imports/models/plugins.qmltypes b/src/imports/models/plugins.qmltypes
index e6d09b76d6..60146f51ba 100644
--- a/src/imports/models/plugins.qmltypes
+++ b/src/imports/models/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml.Models 2.3'
+// 'qmlplugindump -nonrelocatable QtQml.Models 2.11'
Module {
dependencies: []
@@ -19,6 +19,15 @@ Module {
"HorizontalSortHint": 2
}
}
+ Enum {
+ name: "CheckIndexOption"
+ values: {
+ "NoOption": 0,
+ "IndexIsValid": 1,
+ "DoNotUseParent": 2,
+ "ParentIsInvalid": 4
+ }
+ }
Signal {
name: "dataChanged"
Parameter { name: "topLeft"; type: "QModelIndex" }