summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-02-04 14:46:34 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-02-05 09:23:43 +0000
commit9ef4f53f1ff0696d5aae4496715975a2fc884c9b (patch)
treefd94c187a159bfb4ebae2b29c9d2d3bc61379bd1 /src/imports
parent7a053af71f7f53365128f8c337d73ccfbab7f616 (diff)
Bump QtBluetooth QML versions to 5.5
There have been no new additions in Qt 5.5 so far. Change-Id: Ib6c0d7b333bba327942fc48737f9762079062e7b Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/bluetooth/plugin.cpp6
-rw-r--r--src/imports/bluetooth/plugins.qmltypes4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/bluetooth/plugin.cpp b/src/imports/bluetooth/plugin.cpp
index 24206106..dd889d30 100644
--- a/src/imports/bluetooth/plugin.cpp
+++ b/src/imports/bluetooth/plugin.cpp
@@ -67,9 +67,9 @@ public:
qmlRegisterType<QDeclarativeBluetoothService >(uri, major, minor, "BluetoothService");
qmlRegisterType<QDeclarativeBluetoothSocket >(uri, major, minor, "BluetoothSocket");
- // Register the 5.4 types
- // introduces 5.4 version, other existing 5.2 exports become automatically available under 5.2-5.4
- minor = 4;
+ // Register the 5.5 types
+ // introduces 5.5 version, other existing 5.2 exports become automatically available under 5.2-5.4
+ minor = 5;
qmlRegisterType<QDeclarativeBluetoothDiscoveryModel >(uri, major, minor, "BluetoothDiscoveryModel");
}
};
diff --git a/src/imports/bluetooth/plugins.qmltypes b/src/imports/bluetooth/plugins.qmltypes
index cf2146e2..e9b93e54 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.4'
+// 'qmlplugindump -nonrelocatable QtBluetooth 5.5'
Module {
Component {
@@ -13,7 +13,7 @@ Module {
exports: [
"QtBluetooth/BluetoothDiscoveryModel 5.0",
"QtBluetooth/BluetoothDiscoveryModel 5.2",
- "QtBluetooth/BluetoothDiscoveryModel 5.4"
+ "QtBluetooth/BluetoothDiscoveryModel 5.5"
]
exportMetaObjectRevisions: [0, 0, 0]
Enum {