diff options
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/bluetooth/plugin.cpp | 4 | ||||
-rw-r--r-- | src/imports/bluetooth/plugins.qmltypes | 7 | ||||
-rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp | 5 | ||||
-rw-r--r-- | src/imports/nfc/plugin.cpp | 5 | ||||
-rw-r--r-- | src/imports/nfc/plugins.qmltypes | 10 |
5 files changed, 25 insertions, 6 deletions
diff --git a/src/imports/bluetooth/plugin.cpp b/src/imports/bluetooth/plugin.cpp index 6b509c43..bcf59794 100644 --- a/src/imports/bluetooth/plugin.cpp +++ b/src/imports/bluetooth/plugin.cpp @@ -75,6 +75,10 @@ public: qmlRegisterType<QDeclarativeBluetoothService >(uri, major, minor, "BluetoothService"); qmlRegisterType<QDeclarativeBluetoothSocket >(uri, major, minor, "BluetoothSocket"); + // 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<QDeclarativeBluetoothDiscoveryModel >(uri, major, minor, "BluetoothDiscoveryModel"); } }; diff --git a/src/imports/bluetooth/plugins.qmltypes b/src/imports/bluetooth/plugins.qmltypes index 20d57574..18647c2c 100644 --- a/src/imports/bluetooth/plugins.qmltypes +++ b/src/imports/bluetooth/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 QtBluetooth 5.2' +// 'qmlplugindump -notrelocatable QtBluetooth 5.3' Module { Component { @@ -12,9 +12,10 @@ Module { prototype: "QAbstractListModel" exports: [ "QtBluetooth/BluetoothDiscoveryModel 5.0", - "QtBluetooth/BluetoothDiscoveryModel 5.2" + "QtBluetooth/BluetoothDiscoveryModel 5.2", + "QtBluetooth/BluetoothDiscoveryModel 5.3" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 0, 0] Enum { name: "DiscoveryMode" values: { diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp index b7534329..d0d6d7ee 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp @@ -167,6 +167,11 @@ void QDeclarativeBluetoothDiscoveryModel::errorDeviceDiscovery(QBluetoothDeviceD { d->m_error = static_cast<QDeclarativeBluetoothDiscoveryModel::Error>(error); emit errorChanged(); + + //QBluetoothDeviceDiscoveryAgent::finished() signal is not emitted in case of an error + //Note that this behavior is different from QBluetoothServiceDiscoveryAgent. + //This reset the models running flag. + setRunning(false); } void QDeclarativeBluetoothDiscoveryModel::clearModel() diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 0a423495..8694e185 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -84,6 +84,11 @@ public: qmlRegisterType<QDeclarativeNdefTextRecord>(uri, major, minor, "NdefTextRecord"); 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; + qmlRegisterType<QDeclarativeNearField>(uri, major, minor, "NearField"); } }; diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes index 346c0bfa..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.2' +// 'qmlplugindump -notrelocatable QtNfc 5.3' Module { Component { @@ -52,8 +52,12 @@ Module { Component { name: "QDeclarativeNearField" prototype: "QObject" - exports: ["QtNfc/NearField 5.0", "QtNfc/NearField 5.2"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtNfc/NearField 5.0", + "QtNfc/NearField 5.2", + "QtNfc/NearField 5.3" + ] + exportMetaObjectRevisions: [0, 0, 0] Property { name: "messageRecords"; type: "QQmlNdefRecord"; isList: true; isReadonly: true } Property { name: "filter"; type: "QDeclarativeNdefFilter"; isList: true; isReadonly: true } Property { name: "orderMatch"; type: "bool" } |