Update QML versions for QtBluetooth and QtNfc in step with Qt version

Change-Id: I00ac4bbb56bd809784f94812221130365f06218d
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

4 files changed, 11 insertions, 15 deletions

diff --git a/src/imports/bluetooth/plugin.cpp b/src/imports/bluetooth/plugin.cpp
index 2a152e32..07654ca9 100644
--- a/src/imports/bluetooth/plugin.cpp
+++ b/src/imports/bluetooth/plugin.cpp
@@ -81,10 +81,8 @@ public:
         qmlRegisterType<QDeclarativeBluetoothService        >(uri, major, minor, "BluetoothService");
         qmlRegisterType<QDeclarativeBluetoothSocket         >(uri, major, minor, "BluetoothSocket");
 
-        // Register the 5.9 types
-        // introduces 5.9 version, other existing 5.2 exports become automatically available under 5.2-5.8
-        minor = 9;
-        qmlRegisterType<QDeclarativeBluetoothDiscoveryModel >(uri, major, minor, "BluetoothDiscoveryModel");
+        // Register the latest Qt version as QML type version
+        qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
     }
 };
 
diff --git a/src/imports/bluetooth/plugins.qmltypes b/src/imports/bluetooth/plugins.qmltypes
index e23f8740..a00b0324 100644
--- a/src/imports/bluetooth/plugins.qmltypes
+++ b/src/imports/bluetooth/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtBluetooth 5.9'
+// 'qmlplugindump -nonrelocatable QtBluetooth 5.10'
 
 Module {
     dependencies: ["QtQuick 2.8"]
@@ -13,10 +13,9 @@ Module {
         prototype: "QAbstractListModel"
         exports: [
             "QtBluetooth/BluetoothDiscoveryModel 5.0",
-            "QtBluetooth/BluetoothDiscoveryModel 5.2",
-            "QtBluetooth/BluetoothDiscoveryModel 5.9"
+            "QtBluetooth/BluetoothDiscoveryModel 5.2"
         ]
-        exportMetaObjectRevisions: [0, 0, 0]
+        exportMetaObjectRevisions: [0, 0]
         Enum {
             name: "DiscoveryMode"
             values: {
@@ -93,6 +92,7 @@ Module {
             values: {
                 "NoError": -2,
                 "UnknownSocketError": -1,
+                "RemoteHostClosedError": 1,
                 "HostNotFoundError": 2,
                 "ServiceNotFoundError": 9,
                 "NetworkError": 7,
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp
index 53febda2..749e03d7 100644
--- a/src/imports/nfc/plugin.cpp
+++ b/src/imports/nfc/plugin.cpp
@@ -98,10 +98,9 @@ public:
         minor = 5;
         qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField");
 
-        // Register the 5.6 - 5.9 types
-        minor = 9;
-        qmlRegisterType<QDeclarativeNearField, 1>(uri, major, minor, "NearField");
 
+        // Register the latest Qt version as QML type version
+        qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
     }
 };
 
diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes
index 45cf53b8..e6e98c24 100644
--- a/src/imports/nfc/plugins.qmltypes
+++ b/src/imports/nfc/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtNfc 5.9'
+// 'qmlplugindump -nonrelocatable QtNfc 5.10'
 
 Module {
     dependencies: ["QtQuick 2.8"]
@@ -57,10 +57,9 @@ Module {
             "QtNfc/NearField 5.0",
             "QtNfc/NearField 5.2",
             "QtNfc/NearField 5.4",
-            "QtNfc/NearField 5.5",
-            "QtNfc/NearField 5.9"
+            "QtNfc/NearField 5.5"
         ]
-        exportMetaObjectRevisions: [0, 0, 0, 1, 1]
+        exportMetaObjectRevisions: [0, 0, 0, 1]
         Property { name: "messageRecords"; type: "QQmlNdefRecord"; isList: true; isReadonly: true }
         Property { name: "filter"; type: "QDeclarativeNdefFilter"; isList: true; isReadonly: true }
         Property { name: "orderMatch"; type: "bool" }