diff options
| -rw-r--r-- | src/imports/nfc/plugin.cpp | 8 | ||||
| -rw-r--r-- | src/imports/nfc/plugins.qmltypes | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 8694e185..16364cf8 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -43,7 +43,6 @@ #include <QtQml/QQmlExtensionPlugin> #include "qqmlndefrecord.h" -//#include "qdeclarativenearfieldsocket_p.h" #include "qdeclarativenearfield_p.h" #include "qdeclarativendeffilter_p.h" #include "qdeclarativendeftextrecord_p.h" @@ -67,7 +66,6 @@ public: // Register the 5.0 types int major = 5; int minor = 0; - //qmlRegisterType<QDeclarativeNearFieldSocket>(uri, major, minor, "NearFieldSocket"); qmlRegisterType<QDeclarativeNearField>(uri, major, minor, "NearField"); qmlRegisterType<QDeclarativeNdefFilter>(uri, major, minor, "NdefFilter"); @@ -85,9 +83,9 @@ public: qmlRegisterType<QDeclarativeNdefUriRecord>(uri, major, minor, "NdefUriRecord"); qmlRegisterType<QDeclarativeNdefMimeRecord>(uri, major, minor, "NdefMimeRecord"); - // Register the 5.3 types - // introduces 5.3 version, other existing 5.2 exports automatically become availabe under 5.3 as well - minor = 3; + // Register the 5.4 types + // 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"); } }; diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes index fff2834f..bbdc4398 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.3' +// 'qmlplugindump -notrelocatable QtNfc 5.4' Module { Component { @@ -55,7 +55,7 @@ Module { exports: [ "QtNfc/NearField 5.0", "QtNfc/NearField 5.2", - "QtNfc/NearField 5.3" + "QtNfc/NearField 5.4" ] exportMetaObjectRevisions: [0, 0, 0] Property { name: "messageRecords"; type: "QQmlNdefRecord"; isList: true; isReadonly: true } |