diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-02-09 13:34:08 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-02-12 15:02:49 +0000 |
| commit | fa2389dd0a6df58d73d221654db36ff791b96e43 (patch) | |
| tree | a31677dee223739d333276a8576389d40bd342c6 | |
| parent | 40a91836221740cf9391ccfd36b92c368db59a8f (diff) | |
Bump QML types to version 5.7
Change-Id: I4d93ed117fab0047a9d6c90bb3eaa3755c0fa523
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| -rw-r--r-- | src/imports/bluetooth/plugin.cpp | 6 | ||||
| -rw-r--r-- | src/imports/bluetooth/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/imports/nfc/plugin.cpp | 4 | ||||
| -rw-r--r-- | src/imports/nfc/plugins.qmltypes | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/bluetooth/plugin.cpp b/src/imports/bluetooth/plugin.cpp index 9767ee14..eca5736e 100644 --- a/src/imports/bluetooth/plugin.cpp +++ b/src/imports/bluetooth/plugin.cpp @@ -81,9 +81,9 @@ public: qmlRegisterType<QDeclarativeBluetoothService >(uri, major, minor, "BluetoothService"); qmlRegisterType<QDeclarativeBluetoothSocket >(uri, major, minor, "BluetoothSocket"); - // Register the 5.6 types - // introduces 5.6 version, other existing 5.2 exports become automatically available under 5.2-5.5 - minor = 6; + // Register the 5.7 types + // introduces 5.7 version, other existing 5.2 exports become automatically available under 5.2-5.6 + minor = 7; qmlRegisterType<QDeclarativeBluetoothDiscoveryModel >(uri, major, minor, "BluetoothDiscoveryModel"); } }; diff --git a/src/imports/bluetooth/plugins.qmltypes b/src/imports/bluetooth/plugins.qmltypes index 82b143df..e945441a 100644 --- a/src/imports/bluetooth/plugins.qmltypes +++ b/src/imports/bluetooth/plugins.qmltypes @@ -279,7 +279,7 @@ Module { exports: [ "QtBluetooth/BluetoothDiscoveryModel 5.0", "QtBluetooth/BluetoothDiscoveryModel 5.2", - "QtBluetooth/BluetoothDiscoveryModel 5.6" + "QtBluetooth/BluetoothDiscoveryModel 5.7" ] exportMetaObjectRevisions: [0, 0, 0] Enum { diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp index 5d53c657..5f2ccd26 100644 --- a/src/imports/nfc/plugin.cpp +++ b/src/imports/nfc/plugin.cpp @@ -98,8 +98,8 @@ public: minor = 5; qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField"); - // Register the 5.6 types - minor = 6; + // Register the 5.6 - 5.7 types + minor = 7; qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField"); } diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes index 54459946..df1b2a3a 100644 --- a/src/imports/nfc/plugins.qmltypes +++ b/src/imports/nfc/plugins.qmltypes @@ -58,7 +58,7 @@ Module { "QtNfc/NearField 5.2", "QtNfc/NearField 5.4", "QtNfc/NearField 5.5", - "QtNfc/NearField 5.6" + "QtNfc/NearField 5.7" ] exportMetaObjectRevisions: [0, 0, 0, 1, 1] Property { name: "messageRecords"; type: "QQmlNdefRecord"; isList: true; isReadonly: true } |