diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-04 14:34:05 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-05 06:19:00 +0000 |
| commit | 7a053af71f7f53365128f8c337d73ccfbab7f616 (patch) | |
| tree | a87858b83efaa9d96f81ddd49586f91682dd9979 /src/imports | |
| parent | 6839bd80c041678c3d738f9274f7277b825e9dc6 (diff) | |
Bump QtNfc QML API version to 5.5
NearField QML type introduces a new revision which must be registered.
Change-Id: Icc8499380babff5060548c1d25bd9cd67c5229df
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/nfc/plugin.cpp | 4 | ||||
| -rw-r--r-- | src/imports/nfc/plugins.qmltypes | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 52b4db9c..d9a8bc07 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -79,6 +79,10 @@ public: // introduces 5.4 version, other existing 5.2 exports become automatically available under 5.2-5.4l minor = 4; qmlRegisterType<QDeclarativeNearField>(uri, major, minor, "NearField"); + + // Register the 5.5 types + minor = 5; + qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField"); } }; diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes index bbdc4398..6abc211d 100644 --- a/src/imports/nfc/plugins.qmltypes +++ b/src/imports/nfc/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.1 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -notrelocatable QtNfc 5.4' +// 'qmlplugindump -nonrelocatable QtNfc 5.5' Module { Component { @@ -55,12 +55,17 @@ Module { exports: [ "QtNfc/NearField 5.0", "QtNfc/NearField 5.2", - "QtNfc/NearField 5.4" + "QtNfc/NearField 5.4", + "QtNfc/NearField 5.5" ] - exportMetaObjectRevisions: [0, 0, 0] + exportMetaObjectRevisions: [0, 0, 0, 1] Property { name: "messageRecords"; type: "QQmlNdefRecord"; isList: true; isReadonly: true } Property { name: "filter"; type: "QDeclarativeNdefFilter"; isList: true; isReadonly: true } Property { name: "orderMatch"; type: "bool" } + Property { name: "polling"; revision: 1; type: "bool" } + Signal { name: "pollingChanged"; revision: 1 } + Signal { name: "tagFound"; revision: 1 } + Signal { name: "tagRemoved"; revision: 1 } } Component { name: "QQmlNdefRecord" |