diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-08-25 12:52:59 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-08-25 11:04:57 +0000 |
| commit | ee5740d1e11dd84d3d80a357d3eb31eb63eee5a5 (patch) | |
| tree | 9a7bd6f58e29753fd5645f9bbf86e6f97b530404 | |
| parent | 0ee574b29a46be7250d673b2f85f85ee2d18a6fe (diff) | |
Introduce QML Nfc 5.6 versionv5.6.0-alpha1
Change-Id: I99b6dc6c23dd94ff3bca413ba644018880d75eba
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| -rw-r--r-- | src/imports/nfc/plugin.cpp | 5 | ||||
| -rw-r--r-- | src/imports/nfc/plugins.qmltypes | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 14f3b280..ff7474f3 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -83,6 +83,11 @@ public: // Register the 5.5 types minor = 5; qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField"); + + // Register the 5.6 types + minor = 6; + qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField"); + } }; diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes index 555b797f..54459946 100644 --- a/src/imports/nfc/plugins.qmltypes +++ b/src/imports/nfc/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 QtNfc 5.5' +// 'qmlplugindump -nonrelocatable QtNfc 5.6' Module { dependencies: [] @@ -57,9 +57,10 @@ Module { "QtNfc/NearField 5.0", "QtNfc/NearField 5.2", "QtNfc/NearField 5.4", - "QtNfc/NearField 5.5" + "QtNfc/NearField 5.5", + "QtNfc/NearField 5.6" ] - exportMetaObjectRevisions: [0, 0, 0, 1] + exportMetaObjectRevisions: [0, 0, 0, 1, 1] Property { name: "messageRecords"; type: "QQmlNdefRecord"; isList: true; isReadonly: true } Property { name: "filter"; type: "QDeclarativeNdefFilter"; isList: true; isReadonly: true } Property { name: "orderMatch"; type: "bool" } |