diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-27 03:01:25 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-27 03:01:26 +0200 |
| commit | 96db495f53f19ff5bc94772bdfd6ca53ffc0ef6b (patch) | |
| tree | edb37251aaf9aabf6302bdff78f91fc995f629b4 | |
| parent | 48c385336d2b1ce0b21ac540082c3814bc91042d (diff) | |
| parent | e08f9393acc6417598f328d7f4b7b082c5d57afa (diff) | |
| download | qtxmlpatterns-96db495f53f19ff5bc94772bdfd6ca53ffc0ef6b.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I347081eda01d274f7c4db818c52fc98d6632bdd8
| -rw-r--r-- | src/imports/xmllistmodel/plugins.qmltypes | 4 | ||||
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 8 | ||||
| -rw-r--r-- | src/imports/xmllistmodel/xmllistmodel.pro | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/imports/xmllistmodel/plugins.qmltypes b/src/imports/xmllistmodel/plugins.qmltypes index cc675d5..951d0b6 100644 --- a/src/imports/xmllistmodel/plugins.qmltypes +++ b/src/imports/xmllistmodel/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.0' +// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.12' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.12"] Component { name: "QQuickXmlListModel" defaultProperty: "roles" diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index 8941b33..470b419 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -74,7 +74,7 @@ typedef QPair<int, int> QQuickXmlListRange; #define XMLLISTMODEL_CLEAR_ID 0 /*! - \qmlmodule QtQuick.XmlListModel 2.12 + \qmlmodule QtQuick.XmlListModel 2.\QtMinorVersion \title Qt Quick XmlListModel QML Types \ingroup qmlmodules \brief Provides QML types for creating models from XML data @@ -83,9 +83,9 @@ typedef QPair<int, int> QQuickXmlListRange; To use the types in this module, import the module with the following line: - \code - import QtQuick.XmlListModel 2.12 - \endcode + \qml \QtMinorVersion + import QtQuick.XmlListModel 2.\1 + \endqml */ /*! diff --git a/src/imports/xmllistmodel/xmllistmodel.pro b/src/imports/xmllistmodel/xmllistmodel.pro index 8ee9ea3..1e61f4d 100644 --- a/src/imports/xmllistmodel/xmllistmodel.pro +++ b/src/imports/xmllistmodel/xmllistmodel.pro @@ -10,3 +10,5 @@ SOURCES += qqmlxmllistmodel.cpp plugin.cpp HEADERS += qqmlxmllistmodel_p.h load(qml_plugin) + +requires(qtConfig(qml-network)) |