Update qmldir, plugins.qmltypes files

We need a module <Foo> now in qmldir files (related to QTBUG-26551).

Also update the rebuild_qmltypes rule so it creates the files
with the correct name.

Change-Id: I0eed30ac88a38f2b3ca83d008f09412544f99343
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>

6 files changed, 57 insertions, 29 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 4828091..c708a13 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -2,6 +2,8 @@ import QtQuick.tooling 1.1
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
+//
+// This file was auto-generated with the command 'qmlplugindump QtMobility.sensors 1.3 /home/lramsay/build/qt50/qtbase/imports'.
 
 Module {
     Component {
@@ -21,9 +23,9 @@ Module {
             "AccelerometerReading 1.2",
             "AccelerometerReading 1.3"
         ]
-        Property { name: "x"; type: "qreal"; isReadonly: true }
-        Property { name: "y"; type: "qreal"; isReadonly: true }
-        Property { name: "z"; type: "qreal"; isReadonly: true }
+        Property { name: "x"; type: "double"; isReadonly: true }
+        Property { name: "y"; type: "double"; isReadonly: true }
+        Property { name: "z"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QAmbientLightReading"
@@ -68,8 +70,8 @@ Module {
             "CompassReading 1.2",
             "CompassReading 1.3"
         ]
-        Property { name: "azimuth"; type: "qreal"; isReadonly: true }
-        Property { name: "calibrationLevel"; type: "qreal"; isReadonly: true }
+        Property { name: "azimuth"; type: "double"; isReadonly: true }
+        Property { name: "calibrationLevel"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QGyroscope"
@@ -80,15 +82,15 @@ Module {
         name: "QGyroscopeReading"
         prototype: "QSensorReading"
         exports: ["GyroscopeReading 1.2", "GyroscopeReading 1.3"]
-        Property { name: "x"; type: "qreal"; isReadonly: true }
-        Property { name: "y"; type: "qreal"; isReadonly: true }
-        Property { name: "z"; type: "qreal"; isReadonly: true }
+        Property { name: "x"; type: "double"; isReadonly: true }
+        Property { name: "y"; type: "double"; isReadonly: true }
+        Property { name: "z"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QIRProximityReading"
         prototype: "QSensorReading"
         exports: ["IRProximityReading 1.3"]
-        Property { name: "reflectance"; type: "qreal"; isReadonly: true }
+        Property { name: "reflectance"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QIRProximitySensor"
@@ -99,7 +101,7 @@ Module {
         name: "QLightReading"
         prototype: "QSensorReading"
         exports: ["LightReading 1.2", "LightReading 1.3"]
-        Property { name: "lux"; type: "qreal"; isReadonly: true }
+        Property { name: "lux"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QLightSensor"
@@ -119,10 +121,10 @@ Module {
             "MagnetometerReading 1.2",
             "MagnetometerReading 1.3"
         ]
-        Property { name: "x"; type: "qreal"; isReadonly: true }
-        Property { name: "y"; type: "qreal"; isReadonly: true }
-        Property { name: "z"; type: "qreal"; isReadonly: true }
-        Property { name: "calibrationLevel"; type: "qreal"; isReadonly: true }
+        Property { name: "x"; type: "double"; isReadonly: true }
+        Property { name: "y"; type: "double"; isReadonly: true }
+        Property { name: "z"; type: "double"; isReadonly: true }
+        Property { name: "calibrationLevel"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QOrientationReading"
@@ -182,9 +184,9 @@ Module {
             "RotationReading 1.2",
             "RotationReading 1.3"
         ]
-        Property { name: "x"; type: "qreal"; isReadonly: true }
-        Property { name: "y"; type: "qreal"; isReadonly: true }
-        Property { name: "z"; type: "qreal"; isReadonly: true }
+        Property { name: "x"; type: "double"; isReadonly: true }
+        Property { name: "y"; type: "double"; isReadonly: true }
+        Property { name: "z"; type: "double"; isReadonly: true }
     }
     Component {
         name: "QRotationSensor"
@@ -206,7 +208,8 @@ Module {
                 "Buffering": 0,
                 "AlwaysOn": 1,
                 "GeoValues": 2,
-                "FieldOfView": 3
+                "FieldOfView": 3,
+                "Reserved": 257
             }
         }
         Property { name: "sensorid"; type: "QByteArray" }
@@ -222,13 +225,18 @@ Module {
         Property { name: "description"; type: "string"; isReadonly: true }
         Property { name: "error"; type: "int"; isReadonly: true }
         Property { name: "alwaysOn"; revision: 1; type: "bool" }
+        Signal { name: "busyChanged"; type: "void" }
+        Signal { name: "activeChanged"; type: "void" }
+        Signal { name: "readingChanged"; type: "void" }
         Signal {
             name: "sensorError"
+            type: "void"
             Parameter { name: "error"; type: "int" }
         }
-        Signal { name: "availableSensorsChanged" }
+        Signal { name: "availableSensorsChanged"; type: "void" }
+        Signal { name: "alwaysOnChanged"; type: "void" }
         Method { name: "start"; type: "bool" }
-        Method { name: "stop" }
+        Method { name: "stop"; type: "void" }
         Method { name: "connectToBackend"; type: "bool" }
         Method {
             name: "isFeatureSupported"
@@ -244,7 +252,7 @@ Module {
             "SensorReading 1.2",
             "SensorReading 1.3"
         ]
-        Property { name: "timestamp"; type: "quint64"; isReadonly: true }
+        Property { name: "timestamp"; type: "qulonglong"; isReadonly: true }
     }
     Component {
         name: "QTapReading"
diff --git a/src/imports/sensors/qmldir b/src/imports/sensors/qmldir
index 8629eef..a84a2d3 100644
--- a/src/imports/sensors/qmldir
+++ b/src/imports/sensors/qmldir
@@ -1,2 +1,3 @@
+module QtMobility.sensors
 plugin declarative_sensors
 typeinfo plugins.qmltypes
diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro
index 043a435..d533aa0 100644
--- a/src/imports/sensors/sensors.pro
+++ b/src/imports/sensors/sensors.pro
@@ -10,4 +10,4 @@ SOURCES += sensors.cpp
 load(qml_plugin)
 
 OTHER_FILES += \
-    plugin.json
+    plugin.json qmldir plugins.qmltypes
diff --git a/src/imports/sensors2/plugins.qmltypes b/src/imports/sensors2/plugins.qmltypes
index 590bf26..97c9fe3 100644
--- a/src/imports/sensors2/plugins.qmltypes
+++ b/src/imports/sensors2/plugins.qmltypes
@@ -2,6 +2,8 @@ import QtQuick.tooling 1.1
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
+//
+// This file was auto-generated with the command 'qmlplugindump QtSensors 5.0 /home/lramsay/build/qt50/qtbase/imports'.
 
 Module {
     Component {
@@ -20,6 +22,7 @@ Module {
             }
         }
         Property { name: "lightLevel"; type: "LightLevel"; isReadonly: true }
+        Signal { name: "lightLevelChanged"; type: "void" }
     }
     Component {
         name: "QSensor2Gesture"
@@ -32,14 +35,21 @@ Module {
         Property { name: "enabled"; type: "bool" }
         Signal {
             name: "detected"
+            type: "void"
             Parameter { name: "gesture"; type: "string" }
         }
+        Signal { name: "availableGesturesChanged"; type: "void" }
+        Signal { name: "gesturesChanged"; type: "void" }
+        Signal { name: "validGesturesChanged"; type: "void" }
+        Signal { name: "invalidGesturesChanged"; type: "void" }
+        Signal { name: "enabledChanged"; type: "void" }
     }
     Component {
         name: "QSensor2Proximity"
         prototype: "qsensor2common"
         exports: ["ProximitySensor 5.0"]
         Property { name: "near"; type: "bool"; isReadonly: true }
+        Signal { name: "nearChanged"; type: "void" }
     }
     Component {
         name: "QSensor2Tilt"
@@ -60,18 +70,24 @@ Module {
                 "Fast": 2
             }
         }
-        Property { name: "yRotation"; type: "qreal"; isReadonly: true }
-        Property { name: "xRotation"; type: "qreal"; isReadonly: true }
+        Property { name: "yRotation"; type: "double"; isReadonly: true }
+        Property { name: "xRotation"; type: "double"; isReadonly: true }
         Property { name: "unit"; type: "Unit" }
         Property { name: "speed"; type: "Speed" }
-        Property { name: "accuracy"; type: "qreal" }
+        Property { name: "accuracy"; type: "double" }
         Property { name: "settings"; type: "QByteArray" }
+        Signal { name: "unitChanged"; type: "void" }
+        Signal { name: "yRotationChanged"; type: "void" }
+        Signal { name: "xRotationChanged"; type: "void" }
+        Signal { name: "speedChanged"; type: "void" }
         Signal {
             name: "tiltChanged"
-            Parameter { name: "deltaX"; type: "qreal" }
-            Parameter { name: "deltaY"; type: "qreal" }
+            type: "void"
+            Parameter { name: "deltaX"; type: "double" }
+            Parameter { name: "deltaY"; type: "double" }
         }
-        Method { name: "calibrate" }
+        Signal { name: "accuracyChanged"; type: "void" }
+        Method { name: "calibrate"; type: "void" }
     }
     Component {
         name: "qsensor2common"
@@ -79,5 +95,7 @@ Module {
         exports: ["Sensor 5.0"]
         Property { name: "enabled"; type: "bool" }
         Property { name: "alwaysOn"; type: "bool" }
+        Signal { name: "enabledChanged"; type: "void" }
+        Signal { name: "alwaysOnChanged"; type: "void" }
     }
 }
diff --git a/src/imports/sensors2/qmldir b/src/imports/sensors2/qmldir
index d2a2be1..cfef92b 100644
--- a/src/imports/sensors2/qmldir
+++ b/src/imports/sensors2/qmldir
@@ -1,2 +1,3 @@
+module QtSensors
 plugin declarative_qtsensors5
 typeinfo plugins.qmltypes
diff --git a/src/imports/sensors2/sensors2.pro b/src/imports/sensors2/sensors2.pro
index be5060e..24f3fb9 100644
--- a/src/imports/sensors2/sensors2.pro
+++ b/src/imports/sensors2/sensors2.pro
@@ -19,4 +19,4 @@ HEADERS += qsensor2ambientlight.h \
 load(qml_plugin)
 
 OTHER_FILES += \
-    plugin.json
+    plugin.json qmldir plugins.qmltypes