summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2016-12-01 10:21:07 +0100
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-12-06 13:38:00 +0000
commit9665160ee857a2dfb7862950ced348a4caa8479e (patch)
tree2d1b9dbeff16aa2fafe2124dc748f166f8f7ab18
parent2df0d06223f2104eb9e655b3a8d93e6b33cf8cc9 (diff)
Bump/introduce the QML plugin verion 5.8 for the next release
Change-Id: Ia58d1406612e9d6628d1712efba1a582735188a7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r--src/imports/bluetooth/plugin.cpp6
-rw-r--r--src/imports/bluetooth/plugins.qmltypes6
-rw-r--r--src/imports/nfc/plugin.cpp4
-rw-r--r--src/imports/nfc/plugins.qmltypes6
4 files changed, 11 insertions, 11 deletions
diff --git a/src/imports/bluetooth/plugin.cpp b/src/imports/bluetooth/plugin.cpp
index d6c47e35..f77a4d95 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.7 types
- // introduces 5.7 version, other existing 5.2 exports become automatically available under 5.2-5.6
- minor = 7;
+ // Register the 5.8 types
+ // introduces 5.8 version, other existing 5.2 exports become automatically available under 5.2-5.7
+ minor = 8;
qmlRegisterType<QDeclarativeBluetoothDiscoveryModel >(uri, major, minor, "BluetoothDiscoveryModel");
}
};
diff --git a/src/imports/bluetooth/plugins.qmltypes b/src/imports/bluetooth/plugins.qmltypes
index 9c47126d..0ffe3223 100644
--- a/src/imports/bluetooth/plugins.qmltypes
+++ b/src/imports/bluetooth/plugins.qmltypes
@@ -4,17 +4,17 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtBluetooth 5.7'
+// 'qmlplugindump -nonrelocatable QtBluetooth 5.8'
Module {
- dependencies: ["QtQuick 2.0"]
+ dependencies: ["QtQuick 2.8"]
Component {
name: "QDeclarativeBluetoothDiscoveryModel"
prototype: "QAbstractListModel"
exports: [
"QtBluetooth/BluetoothDiscoveryModel 5.0",
"QtBluetooth/BluetoothDiscoveryModel 5.2",
- "QtBluetooth/BluetoothDiscoveryModel 5.7"
+ "QtBluetooth/BluetoothDiscoveryModel 5.8"
]
exportMetaObjectRevisions: [0, 0, 0]
Enum {
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp
index b71f1f24..d003f531 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 - 5.7 types
- minor = 7;
+ // Register the 5.6 - 5.8 types
+ minor = 8;
qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField");
}
diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes
index 7bba6d95..c9fae196 100644
--- a/src/imports/nfc/plugins.qmltypes
+++ b/src/imports/nfc/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtNfc 5.7'
+// 'qmlplugindump -nonrelocatable QtNfc 5.8'
Module {
- dependencies: ["QtQuick 2.0"]
+ dependencies: ["QtQuick 2.8"]
Component {
name: "QDeclarativeNdefFilter"
prototype: "QObject"
@@ -58,7 +58,7 @@ Module {
"QtNfc/NearField 5.2",
"QtNfc/NearField 5.4",
"QtNfc/NearField 5.5",
- "QtNfc/NearField 5.7"
+ "QtNfc/NearField 5.8"
]
exportMetaObjectRevisions: [0, 0, 0, 1, 1]
Property { name: "messageRecords"; type: "QQmlNdefRecord"; isList: true; isReadonly: true }