diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-26 12:37:53 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-26 14:51:02 +0100 |
commit | 330beaf713e27146fb95b7e2b3429edd76835c8a (patch) | |
tree | 2211f8ddc9e4bfcd2b5affd2933821a4df7e897e /src/imports | |
parent | a980a15849f12b4ec5a069c90fa5c080295daa02 (diff) |
Revert "Bump latest Nfc QML API version to 5.4"
This reverts commit 4bc3513f18fa6a7345708748590f6a1acda486dd
THis should have gone to dev branch
Change-Id: I231818b3ac31871072a7b4630e14659a7aea78c1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/nfc/plugin.cpp | 8 | ||||
-rw-r--r-- | src/imports/nfc/plugins.qmltypes | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 16364cf8..8694e185 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -43,6 +43,7 @@ #include <QtQml/QQmlExtensionPlugin> #include "qqmlndefrecord.h" +//#include "qdeclarativenearfieldsocket_p.h" #include "qdeclarativenearfield_p.h" #include "qdeclarativendeffilter_p.h" #include "qdeclarativendeftextrecord_p.h" @@ -66,6 +67,7 @@ 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"); @@ -83,9 +85,9 @@ public: qmlRegisterType<QDeclarativeNdefUriRecord>(uri, major, minor, "NdefUriRecord"); qmlRegisterType<QDeclarativeNdefMimeRecord>(uri, major, minor, "NdefMimeRecord"); - // Register the 5.4 types - // introduces 5.4 version, other existing 5.2 exports become automatically available under 5.2-5.4l - minor = 4; + // Register the 5.3 types + // introduces 5.3 version, other existing 5.2 exports automatically become availabe under 5.3 as well + minor = 3; qmlRegisterType<QDeclarativeNearField>(uri, major, minor, "NearField"); } }; diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes index bbdc4398..fff2834f 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 -notrelocatable QtNfc 5.3' Module { Component { @@ -55,7 +55,7 @@ Module { exports: [ "QtNfc/NearField 5.0", "QtNfc/NearField 5.2", - "QtNfc/NearField 5.4" + "QtNfc/NearField 5.3" ] exportMetaObjectRevisions: [0, 0, 0] Property { name: "messageRecords"; type: "QQmlNdefRecord"; isList: true; isReadonly: true } |