Update QtMobility QML type descriptions to 1.2.0.

Change-Id: I31b0f9cc55763d22dbf6ff75252c6e10e5a1b0f2
Reviewed-on: http://codereview.qt.nokia.com/481
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

9 files changed, 1793 insertions, 210 deletions

diff --git a/share/qtcreator/qml-type-descriptions/qtmobility-connectivity.qmltypes b/share/qtcreator/qml-type-descriptions/qtmobility-connectivity.qmltypes
new file mode 100644
index 0000000000..25f8e6fd75
--- /dev/null
+++ b/share/qtcreator/qml-type-descriptions/qtmobility-connectivity.qmltypes
@@ -0,0 +1,327 @@
+import QtQuick.tooling 1.0
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+
+Module {
+    Component {
+        name: "QAbstractItemModel"
+        prototype: "QObject"
+        Signal {
+            name: "dataChanged"
+            Parameter { name: "topLeft"; type: "QModelIndex" }
+            Parameter { name: "bottomRight"; type: "QModelIndex" }
+        }
+        Signal {
+            name: "headerDataChanged"
+            Parameter { name: "orientation"; type: "Qt::Orientation" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal { name: "layoutChanged" }
+        Signal { name: "layoutAboutToBeChanged" }
+        Signal {
+            name: "rowsAboutToBeInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "rowsInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "rowsAboutToBeRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "rowsRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsAboutToBeInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsAboutToBeRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal { name: "modelAboutToBeReset" }
+        Signal { name: "modelReset" }
+        Signal {
+            name: "rowsAboutToBeMoved"
+            Parameter { name: "sourceParent"; type: "QModelIndex" }
+            Parameter { name: "sourceStart"; type: "int" }
+            Parameter { name: "sourceEnd"; type: "int" }
+            Parameter { name: "destinationParent"; type: "QModelIndex" }
+            Parameter { name: "destinationRow"; type: "int" }
+        }
+        Signal {
+            name: "rowsMoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+            Parameter { name: "destination"; type: "QModelIndex" }
+            Parameter { name: "row"; type: "int" }
+        }
+        Signal {
+            name: "columnsAboutToBeMoved"
+            Parameter { name: "sourceParent"; type: "QModelIndex" }
+            Parameter { name: "sourceStart"; type: "int" }
+            Parameter { name: "sourceEnd"; type: "int" }
+            Parameter { name: "destinationParent"; type: "QModelIndex" }
+            Parameter { name: "destinationColumn"; type: "int" }
+        }
+        Signal {
+            name: "columnsMoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+            Parameter { name: "destination"; type: "QModelIndex" }
+            Parameter { name: "column"; type: "int" }
+        }
+        Method { name: "submit"; type: "bool" }
+        Method { name: "revert" }
+    }
+    Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
+    Component {
+        name: "QDeclarativeBluetoothDiscoveryModel"
+        prototype: "QAbstractListModel"
+        exports: [
+            "QtMobility.connectivity/BluetoothDiscoveryModel 1.2"
+        ]
+        Property { name: "error"; type: "string"; isReadonly: true }
+        Property { name: "minimalDiscovery"; type: "bool" }
+        Property { name: "discovery"; type: "bool" }
+        Property { name: "uuidFilter"; type: "string" }
+        Signal { name: "errorChanged" }
+        Signal { name: "minimalDiscoveryChanged" }
+        Signal {
+            name: "newServiceDiscovered"
+            Parameter { name: "service"; type: "QDeclarativeBluetoothService"; isPointer: true }
+        }
+        Signal { name: "discoveryChanged" }
+        Signal { name: "uuidFilterChanged" }
+        Method {
+            name: "setDiscovery"
+            Parameter { name: "discovery_"; type: "bool" }
+        }
+    }
+    Component {
+        name: "QDeclarativeBluetoothService"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.connectivity/BluetoothService 1.2"
+        ]
+        Property { name: "deviceName"; type: "string"; isReadonly: true }
+        Property { name: "deviceAddress"; type: "string" }
+        Property { name: "serviceName"; type: "string" }
+        Property { name: "serviceDescription"; type: "string" }
+        Property { name: "serviceUuid"; type: "string" }
+        Property { name: "serviceProtocol"; type: "string" }
+        Property { name: "servicePort"; type: "qint32" }
+        Property { name: "registered"; type: "bool" }
+        Signal { name: "detailsChanged" }
+        Signal { name: "registeredChanged" }
+        Signal { name: "newClient" }
+        Method {
+            name: "setServiceName"
+            Parameter { name: "name"; type: "string" }
+        }
+        Method {
+            name: "setDeviceAddress"
+            Parameter { name: "address"; type: "string" }
+        }
+        Method {
+            name: "setServiceDescription"
+            Parameter { name: "description"; type: "string" }
+        }
+        Method {
+            name: "setServiceUuid"
+            Parameter { name: "uuid"; type: "string" }
+        }
+        Method {
+            name: "setServiceProtocol"
+            Parameter { name: "protocol"; type: "string" }
+        }
+        Method {
+            name: "setServicePort"
+            Parameter { name: "port"; type: "qint32" }
+        }
+        Method {
+            name: "setRegistered"
+            Parameter { name: "registered"; type: "bool" }
+        }
+        Method { name: "nextClient"; type: "QDeclarativeBluetoothSocket*" }
+        Method {
+            name: "assignNextClient"
+            Parameter { name: "dbs"; type: "QDeclarativeBluetoothSocket"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QDeclarativeBluetoothSocket"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.connectivity/BluetoothSocket 1.2"
+        ]
+        Property { name: "service"; type: "QDeclarativeBluetoothService"; isPointer: true }
+        Property { name: "connected"; type: "bool" }
+        Property { name: "error"; type: "string"; isReadonly: true }
+        Property { name: "state"; type: "string"; isReadonly: true }
+        Property { name: "stringData"; type: "string" }
+        Signal { name: "serviceChanged" }
+        Signal { name: "connectedChanged" }
+        Signal { name: "errorChanged" }
+        Signal { name: "stateChanged" }
+        Signal { name: "dataAvailable" }
+        Method {
+            name: "setService"
+            Parameter { name: "service"; type: "QDeclarativeBluetoothService"; isPointer: true }
+        }
+        Method {
+            name: "setConnected"
+            Parameter { name: "connected"; type: "bool" }
+        }
+        Method {
+            name: "sendStringData"
+            Parameter { name: "data"; type: "string" }
+        }
+    }
+    Component {
+        name: "QDeclarativeNdefFilter"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.connectivity/NdefFilter 1.2"
+        ]
+        Property { name: "type"; type: "string" }
+        Property { name: "minimum"; type: "int" }
+        Property { name: "maximum"; type: "int" }
+        Signal { name: "typeChanged" }
+        Signal { name: "minimumChanged" }
+        Signal { name: "maximumChanged" }
+    }
+    Component {
+        name: "QDeclarativeNdefMimeRecord"
+        prototype: "QDeclarativeNdefRecord"
+        exports: [
+            "QtMobility.connectivity/NdefMimeRecord 1.2"
+        ]
+        Property { name: "uri"; type: "string"; isReadonly: true }
+        Signal { name: "uriChanged" }
+    }
+    Component {
+        name: "QDeclarativeNdefRecord"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.connectivity/NdefRecord 1.2"
+        ]
+        Property { name: "recordType"; type: "string" }
+        Signal { name: "recordTypeChanged" }
+    }
+    Component {
+        name: "QDeclarativeNdefTextRecord"
+        prototype: "QDeclarativeNdefRecord"
+        exports: [
+            "QtMobility.connectivity/NdefTextRecord 1.2"
+        ]
+        Enum {
+            name: "LocaleMatch"
+            values: {
+                "LocaleMatchedNone": 0,
+                "LocaleMatchedEnglish": 1,
+                "LocaleMatchedLanguage": 2,
+                "LocaleMatchedLanguageAndCountry": 3
+            }
+        }
+        Property { name: "text"; type: "string" }
+        Property { name: "locale"; type: "string" }
+        Property { name: "localeMatch"; type: "LocaleMatch"; isReadonly: true }
+        Signal { name: "textChanged" }
+        Signal { name: "localeChanged" }
+        Signal { name: "localeMatchChanged" }
+    }
+    Component {
+        name: "QDeclarativeNdefUriRecord"
+        prototype: "QDeclarativeNdefRecord"
+        exports: [
+            "QtMobility.connectivity/NdefUriRecord 1.2"
+        ]
+        Property { name: "uri"; type: "string" }
+        Signal { name: "uriChanged" }
+    }
+    Component {
+        name: "QDeclarativeNearField"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.connectivity/NearField 1.2"
+        ]
+        Property {
+            name: "messageRecords"
+            type: "QDeclarativeNdefRecord"
+            isList: true
+            isReadonly: true
+        }
+        Property { name: "filter"; type: "QDeclarativeNdefFilter"; isList: true; isReadonly: true }
+        Property { name: "orderMatch"; type: "bool" }
+        Signal { name: "messageRecordsChanged" }
+        Signal { name: "filterChanged" }
+        Signal { name: "orderMatchChanged" }
+    }
+    Component {
+        name: "QDeclarativeNearFieldSocket"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.connectivity/NearFieldSocket 1.2"
+        ]
+        Property { name: "uri"; type: "string" }
+        Property { name: "connected"; type: "bool" }
+        Property { name: "error"; type: "string"; isReadonly: true }
+        Property { name: "state"; type: "string"; isReadonly: true }
+        Property { name: "listening"; type: "bool" }
+        Property { name: "stringData"; type: "string" }
+        Signal { name: "uriChanged" }
+        Signal { name: "connectedChanged" }
+        Signal { name: "errorChanged" }
+        Signal { name: "stateChanged" }
+        Signal { name: "listeningChanged" }
+        Signal { name: "dataAvailable" }
+        Method {
+            name: "setUri"
+            Parameter { name: "service"; type: "string" }
+        }
+        Method {
+            name: "setConnected"
+            Parameter { name: "connected"; type: "bool" }
+        }
+        Method {
+            name: "setListening"
+            Parameter { name: "listen"; type: "bool" }
+        }
+        Method {
+            name: "sendStringData"
+            Parameter { name: "data"; type: "string" }
+        }
+    }
+}
diff --git a/share/qtcreator/qml-type-descriptions/qtmobility-feedback.qmltypes b/share/qtcreator/qml-type-descriptions/qtmobility-feedback.qmltypes
index e95127827c..b51bdd5258 100644
--- a/share/qtcreator/qml-type-descriptions/qtmobility-feedback.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/qtmobility-feedback.qmltypes
@@ -5,10 +5,29 @@ import QtQuick.tooling 1.0
 
 Module {
     Component {
-        name: "QDeclarativeFeedback"
+        name: "QDeclarativeFeedbackActuator"
         prototype: "QObject"
         exports: [
-            "QtMobility.feedback/Feedback 1.1"
+            "QtMobility.feedback/Actuator 1.1"
+        ]
+        Property { name: "actuatorId"; type: "int"; isReadonly: true }
+        Property { name: "name"; type: "string"; isReadonly: true }
+        Property { name: "state"; type: "QFeedbackActuator::State"; isReadonly: true }
+        Property { name: "valid"; type: "bool"; isReadonly: true }
+        Property { name: "enabled"; type: "bool" }
+        Signal { name: "enabledChanged" }
+        Method {
+            name: "isCapabilitySupported"
+            type: "bool"
+            Parameter { name: "capbility"; type: "QFeedbackActuator::Capability" }
+        }
+    }
+    Component {
+        name: "QDeclarativeFeedbackEffect"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.feedback/Feedback 1.1",
+            "QtMobility.feedback/FeedbackEffect 1.1"
         ]
         Enum {
             name: "Duration"
@@ -32,32 +51,58 @@ Module {
                 "DeviceBusy": 1
             }
         }
+        Property { name: "running"; type: "bool" }
+        Property { name: "paused"; type: "bool" }
+        Property { name: "duration"; type: "int" }
+        Property { name: "state"; type: "State" }
+        Property { name: "error"; type: "ErrorType"; isReadonly: true }
+        Signal { name: "runningChanged" }
+        Signal { name: "pausedChanged" }
+        Signal { name: "durationChanged" }
+        Signal { name: "stateChanged" }
+        Signal { name: "errorChanged" }
+        Method { name: "updateState" }
     }
     Component {
         name: "QDeclarativeFileEffect"
-        prototype: "QFeedbackFileEffect"
+        prototype: "QDeclarativeFeedbackEffect"
         exports: [
             "QtMobility.feedback/FileEffect 1.1"
         ]
-        Property { name: "running"; type: "bool" }
-        Property { name: "paused"; type: "bool" }
-        Signal { name: "runningChanged" }
-        Signal { name: "pausedChanged" }
-        Method { name: "updateState" }
+        Property { name: "loaded"; type: "bool" }
+        Property { name: "source"; type: "QUrl" }
+        Property { name: "supportedMimeTypes"; type: "QStringList"; isReadonly: true }
+        Signal { name: "loadedChanged" }
+        Signal { name: "sourceChanged" }
+        Method { name: "load" }
+        Method { name: "unload" }
     }
     Component {
         name: "QDeclarativeHapticsEffect"
-        prototype: "QFeedbackHapticsEffect"
+        prototype: "QDeclarativeFeedbackEffect"
         exports: [
             "QtMobility.feedback/HapticsEffect 1.1"
         ]
-        Property { name: "actuators"; type: "QFeedbackActuator"; isList: true; isReadonly: true }
-        Property { name: "running"; type: "bool" }
-        Property { name: "paused"; type: "bool" }
-        Signal { name: "runningChanged" }
-        Signal { name: "pausedChanged" }
-        Signal { name: "actuatorsChanged" }
-        Method { name: "updateState" }
+        Property {
+            name: "availableActuators"
+            type: "QDeclarativeFeedbackActuator"
+            isList: true
+            isReadonly: true
+        }
+        Property { name: "intensity"; type: "qreal" }
+        Property { name: "attackTime"; type: "int" }
+        Property { name: "attackIntensity"; type: "qreal" }
+        Property { name: "fadeTime"; type: "int" }
+        Property { name: "fadeIntensity"; type: "qreal" }
+        Property { name: "period"; type: "int" }
+        Property { name: "actuator"; type: "QDeclarativeFeedbackActuator"; isPointer: true }
+        Signal { name: "intensityChanged" }
+        Signal { name: "attackTimeChanged" }
+        Signal { name: "attackIntensityChanged" }
+        Signal { name: "fadeTimeChanged" }
+        Signal { name: "fadeIntensityChanged" }
+        Signal { name: "periodChanged" }
+        Signal { name: "actuatorChanged" }
     }
     Component {
         name: "QDeclarativeThemeEffect"
@@ -110,131 +155,4 @@ Module {
         Signal { name: "effectChanged" }
         Method { name: "play" }
     }
-    Component {
-        name: "QFeedbackActuator"
-        prototype: "QObject"
-        exports: [
-            "QtMobility.feedback/Actuator 1.1"
-        ]
-        Enum {
-            name: "Capability"
-            values: {
-                "Envelope": 0,
-                "Period": 1
-            }
-        }
-        Enum {
-            name: "State"
-            values: {
-                "Busy": 0,
-                "Ready": 1,
-                "Unknown": 2
-            }
-        }
-        Property { name: "id"; type: "int"; isReadonly: true }
-        Property { name: "name"; type: "string"; isReadonly: true }
-        Property { name: "state"; type: "QFeedbackActuator::State"; isReadonly: true }
-        Property { name: "valid"; type: "bool"; isReadonly: true }
-        Property { name: "enabled"; type: "bool" }
-        Signal { name: "enabledChanged" }
-        Method {
-            name: "isCapabilitySupported"
-            type: "bool"
-            Parameter { type: "Capability" }
-        }
-    }
-    Component {
-        name: "QFeedbackEffect"
-        prototype: "QObject"
-        Enum {
-            name: "ThemeEffect"
-            values: {
-                "ThemeBasic": 0,
-                "ThemeSensitive": 1,
-                "ThemeBasicButton": 2,
-                "ThemeSensitiveButton": 3,
-                "ThemeBasicKeypad": 4,
-                "ThemeSensitiveKeypad": 5,
-                "ThemeBasicSlider": 6,
-                "ThemeSensitiveSlider": 7,
-                "ThemeBasicItem": 8,
-                "ThemeSensitiveItem": 9,
-                "ThemeItemScroll": 10,
-                "ThemeItemPick": 11,
-                "ThemeItemDrop": 12,
-                "ThemeItemMoveOver": 13,
-                "ThemeBounceEffect": 14,
-                "ThemeCheckBox": 15,
-                "ThemeMultipleCheckBox": 16,
-                "ThemeEditor": 17,
-                "ThemeTextSelection": 18,
-                "ThemeBlankSelection": 19,
-                "ThemeLineSelection": 20,
-                "ThemeEmptyLineSelection": 21,
-                "ThemePopUp": 22,
-                "ThemePopupOpen": 23,
-                "ThemePopupClose": 24,
-                "ThemeFlick": 25,
-                "ThemeStopFlick": 26,
-                "ThemeMultiPointTouchActivate": 27,
-                "ThemeRotateStep": 28,
-                "ThemeLongPress": 29,
-                "ThemePositiveTacticon": 30,
-                "ThemeNeutralTacticon": 31,
-                "ThemeNegativeTacticon": 32,
-                "NumberOfThemeEffects": 33,
-                "ThemeUser": 65535
-            }
-        }
-        Enum {
-            name: "Duration"
-            values: {
-                "Infinite": -1
-            }
-        }
-        Enum {
-            name: "State"
-            values: {
-                "Stopped": 0,
-                "Paused": 1,
-                "Running": 2,
-                "Loading": 3
-            }
-        }
-        Enum {
-            name: "ErrorType"
-            values: {
-                "UnknownError": 0,
-                "DeviceBusy": 1
-            }
-        }
-        Property { name: "duration"; type: "int"; isReadonly: true }
-        Property { name: "state"; type: "State"; isReadonly: true }
-        Signal {
-            name: "error"
-            Parameter { type: "QFeedbackEffect::ErrorType" }
-        }
-        Signal { name: "stateChanged" }
-        Method { name: "start" }
-        Method { name: "stop" }
-        Method { name: "pause" }
-    }
-    Component {
-        name: "QFeedbackFileEffect"
-        prototype: "QFeedbackEffect"
-        Property { name: "loaded"; type: "bool" }
-        Property { name: "source"; type: "QUrl" }
-    }
-    Component {
-        name: "QFeedbackHapticsEffect"
-        prototype: "QFeedbackEffect"
-        Property { name: "duration"; type: "int" }
-        Property { name: "intensity"; type: "qreal" }
-        Property { name: "attackTime"; type: "int" }
-        Property { name: "attackIntensity"; type: "qreal" }
-        Property { name: "fadeTime"; type: "int" }
-        Property { name: "fadeIntensity"; type: "int" }
-        Property { name: "period"; type: "int" }
-        Property { name: "actuator"; type: "QFeedbackActuator"; isPointer: true }
-    }
 }
diff --git a/share/qtcreator/qml-type-descriptions/qtmobility-gallery.qmltypes b/share/qtcreator/qml-type-descriptions/qtmobility-gallery.qmltypes
index bdc5093842..652e76daed 100644
--- a/share/qtcreator/qml-type-descriptions/qtmobility-gallery.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/qtmobility-gallery.qmltypes
@@ -411,4 +411,14 @@ Module {
             "QtMobility.gallery/GalleryWildcardFilter 1.1"
         ]
     }
+    Component {
+        name: "QDeclarativePropertyMap"
+        prototype: "QObject"
+        Signal {
+            name: "valueChanged"
+            Parameter { name: "key"; type: "string" }
+            Parameter { name: "value"; type: "QVariant" }
+        }
+        Method { name: "keys"; type: "QStringList" }
+    }
 }
diff --git a/share/qtcreator/qml-type-descriptions/qtmobility-location.qmltypes b/share/qtcreator/qml-type-descriptions/qtmobility-location-1.1.qmltypes
index dd1f22f63b..dd1f22f63b 100644
--- a/share/qtcreator/qml-type-descriptions/qtmobility-location.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/qtmobility-location-1.1.qmltypes
diff --git a/share/qtcreator/qml-type-descriptions/qtmobility-location-1.2.qmltypes b/share/qtcreator/qml-type-descriptions/qtmobility-location-1.2.qmltypes
new file mode 100644
index 0000000000..88dd54523b
--- /dev/null
+++ b/share/qtcreator/qml-type-descriptions/qtmobility-location-1.2.qmltypes
@@ -0,0 +1,908 @@
+import QtQuick.tooling 1.0
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+
+Module {
+    Component {
+        name: "QAbstractItemModel"
+        prototype: "QObject"
+        Signal {
+            name: "dataChanged"
+            Parameter { name: "topLeft"; type: "QModelIndex" }
+            Parameter { name: "bottomRight"; type: "QModelIndex" }
+        }
+        Signal {
+            name: "headerDataChanged"
+            Parameter { name: "orientation"; type: "Qt::Orientation" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal { name: "layoutChanged" }
+        Signal { name: "layoutAboutToBeChanged" }
+        Signal {
+            name: "rowsAboutToBeInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "rowsInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "rowsAboutToBeRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "rowsRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsAboutToBeInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsAboutToBeRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal { name: "modelAboutToBeReset" }
+        Signal { name: "modelReset" }
+        Signal {
+            name: "rowsAboutToBeMoved"
+            Parameter { name: "sourceParent"; type: "QModelIndex" }
+            Parameter { name: "sourceStart"; type: "int" }
+            Parameter { name: "sourceEnd"; type: "int" }
+            Parameter { name: "destinationParent"; type: "QModelIndex" }
+            Parameter { name: "destinationRow"; type: "int" }
+        }
+        Signal {
+            name: "rowsMoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+            Parameter { name: "destination"; type: "QModelIndex" }
+            Parameter { name: "row"; type: "int" }
+        }
+        Signal {
+            name: "columnsAboutToBeMoved"
+            Parameter { name: "sourceParent"; type: "QModelIndex" }
+            Parameter { name: "sourceStart"; type: "int" }
+            Parameter { name: "sourceEnd"; type: "int" }
+            Parameter { name: "destinationParent"; type: "QModelIndex" }
+            Parameter { name: "destinationColumn"; type: "int" }
+        }
+        Signal {
+            name: "columnsMoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+            Parameter { name: "destination"; type: "QModelIndex" }
+            Parameter { name: "column"; type: "int" }
+        }
+        Method { name: "submit"; type: "bool" }
+        Method { name: "revert" }
+    }
+    Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
+    Component {
+        name: "QDeclarativeCoordinate"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/Coordinate 1.1"
+        ]
+        Property { name: "latitude"; type: "double" }
+        Property { name: "longitude"; type: "double" }
+        Property { name: "altitude"; type: "double" }
+        Signal {
+            name: "latitudeChanged"
+            Parameter { name: "latitude"; type: "double" }
+        }
+        Signal {
+            name: "longitudeChanged"
+            Parameter { name: "longitude"; type: "double" }
+        }
+        Signal {
+            name: "altitudeChanged"
+            Parameter { name: "altitude"; type: "double" }
+        }
+        Method {
+            name: "distanceTo"
+            type: "qreal"
+            Parameter { name: "coordinate"; type: "QObject"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoAddress"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/Address 1.1"
+        ]
+        Property { name: "country"; type: "string" }
+        Property { name: "countryCode"; type: "string" }
+        Property { name: "state"; type: "string" }
+        Property { name: "county"; type: "string" }
+        Property { name: "city"; type: "string" }
+        Property { name: "district"; type: "string" }
+        Property { name: "street"; type: "string" }
+        Property { name: "postcode"; type: "string" }
+        Signal { name: "countryChanged" }
+        Signal { name: "countryCodeChanged" }
+        Signal { name: "stateChanged" }
+        Signal { name: "countyChanged" }
+        Signal { name: "cityChanged" }
+        Signal { name: "districtChanged" }
+        Signal { name: "streetChanged" }
+        Signal { name: "postcodeChanged" }
+    }
+    Component {
+        name: "QDeclarativeGeoBoundingBox"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/BoundingBox 1.1"
+        ]
+        Property { name: "bottomLeft"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "bottomRight"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "topLeft"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "topRight"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "center"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "height"; type: "double" }
+        Property { name: "width"; type: "double" }
+        Signal { name: "bottomLeftChanged" }
+        Signal { name: "bottomRightChanged" }
+        Signal { name: "topLeftChanged" }
+        Signal { name: "topRightChanged" }
+        Signal { name: "centerChanged" }
+        Signal { name: "heightChanged" }
+        Signal { name: "widthChanged" }
+    }
+    Component {
+        name: "QDeclarativeGeoMapCircleObject"
+        defaultProperty: "data"
+        prototype: "QDeclarativeGeoMapObject"
+        exports: [
+            "QtMobility.location/MapCircle 1.2"
+        ]
+        Property { name: "center"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "radius"; type: "qreal" }
+        Property { name: "color"; type: "QColor" }
+        Property {
+            name: "border"
+            type: "QDeclarativeGeoMapObjectBorder"
+            isReadonly: true
+            isPointer: true
+        }
+        Signal {
+            name: "centerChanged"
+            Parameter { name: "center"; type: "const QDeclarativeCoordinate"; isPointer: true }
+        }
+        Signal {
+            name: "radiusChanged"
+            Parameter { name: "radius"; type: "qreal" }
+        }
+        Signal {
+            name: "colorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoMapGroupObject"
+        defaultProperty: "data"
+        prototype: "QDeclarativeGeoMapObject"
+        exports: [
+            "QtMobility.location/MapGroup 1.2"
+        ]
+        Property { name: "objects"; type: "QDeclarativeGeoMapObject"; isList: true; isReadonly: true }
+    }
+    Component {
+        name: "QDeclarativeGeoMapMouseArea"
+        defaultProperty: "data"
+        prototype: "QDeclarativeItem"
+        exports: [
+            "QtMobility.location/MapMouseArea 1.2"
+        ]
+        Property { name: "mouseX"; type: "qreal"; isReadonly: true }
+        Property { name: "mouseY"; type: "qreal"; isReadonly: true }
+        Property { name: "containsMouse"; type: "bool"; isReadonly: true }
+        Property { name: "pressed"; type: "bool"; isReadonly: true }
+        Property { name: "enabled"; type: "bool" }
+        Property { name: "pressedButton"; type: "Qt::MouseButton"; isReadonly: true }
+        Property { name: "acceptedButtons"; type: "Qt::MouseButtons" }
+        Property { name: "hoverEnabled"; type: "bool" }
+        Signal { name: "mousePositionChanged" }
+        Signal {
+            name: "hoveredChanged"
+            Parameter { name: "hovered"; type: "bool" }
+        }
+        Signal {
+            name: "pressedChanged"
+            Parameter { name: "pressed"; type: "bool" }
+        }
+        Signal {
+            name: "enabledChanged"
+            Parameter { name: "enabled"; type: "bool" }
+        }
+        Signal {
+            name: "pressedButtonChanged"
+            Parameter { name: "pressedButton"; type: "Qt::MouseButtons" }
+        }
+        Signal {
+            name: "acceptedButtonsChanged"
+            Parameter { name: "acceptedButtons"; type: "Qt::MouseButtons" }
+        }
+        Signal {
+            name: "hoverEnabledChanged"
+            Parameter { name: "hoverEnabled"; type: "bool" }
+        }
+        Signal {
+            name: "positionChanged"
+            Parameter { name: "mouse"; type: "QDeclarativeGeoMapMouseEvent"; isPointer: true }
+        }
+        Signal {
+            name: "pressed"
+            Parameter { name: "mouse"; type: "QDeclarativeGeoMapMouseEvent"; isPointer: true }
+        }
+        Signal {
+            name: "released"
+            Parameter { name: "mouse"; type: "QDeclarativeGeoMapMouseEvent"; isPointer: true }
+        }
+        Signal {
+            name: "clicked"
+            Parameter { name: "mouse"; type: "QDeclarativeGeoMapMouseEvent"; isPointer: true }
+        }
+        Signal {
+            name: "doubleClicked"
+            Parameter { name: "mouse"; type: "QDeclarativeGeoMapMouseEvent"; isPointer: true }
+        }
+        Signal { name: "entered" }
+        Signal { name: "exited" }
+    }
+    Component {
+        name: "QDeclarativeGeoMapMouseEvent"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/MapMouseEvent 1.2"
+        ]
+        Property { name: "accepted"; type: "bool" }
+        Property { name: "button"; type: "int"; isReadonly: true }
+        Property { name: "modifiers"; type: "int"; isReadonly: true }
+        Property { name: "x"; type: "int"; isReadonly: true }
+        Property { name: "y"; type: "int"; isReadonly: true }
+        Property { name: "coordinate"; type: "QDeclarativeCoordinate"; isReadonly: true; isPointer: true }
+    }
+    Component {
+        name: "QDeclarativeGeoMapObject"
+        defaultProperty: "data"
+        prototype: "QDeclarativeItem"
+        exports: [
+            "QtMobility.location/MapObject 1.2"
+        ]
+        Property { name: "visible"; type: "bool" }
+        Signal {
+            name: "visibleChanged"
+            Parameter { name: "visible"; type: "bool" }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoMapObjectView"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/MapObjectView 1.2"
+        ]
+        Property { name: "model"; type: "QVariant" }
+        Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "z"; type: "qreal" }
+        Signal { name: "modelChanged" }
+        Signal { name: "delegateChanged" }
+        Signal { name: "visibleChanged" }
+        Signal { name: "zChanged" }
+    }
+    Component {
+        name: "QDeclarativeGeoMapPixmapObject"
+        defaultProperty: "data"
+        prototype: "QDeclarativeGeoMapObject"
+        exports: [
+            "QtMobility.location/MapImage 1.2"
+        ]
+        Enum {
+            name: "Status"
+            values: {
+                "Null": 0,
+                "Ready": 1,
+                "Loading": 2,
+                "Error": 3
+            }
+        }
+        Property { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "source"; type: "QUrl" }
+        Property { name: "offset"; type: "QPoint" }
+        Property { name: "status"; type: "Status"; isReadonly: true }
+        Signal {
+            name: "coordinateChanged"
+            Parameter { name: "coordinate"; type: "const QDeclarativeCoordinate"; isPointer: true }
+        }
+        Signal {
+            name: "sourceChanged"
+            Parameter { name: "source"; type: "QUrl" }
+        }
+        Signal {
+            name: "offsetChanged"
+            Parameter { name: "offset"; type: "QPoint" }
+        }
+        Signal {
+            name: "statusChanged"
+            Parameter { name: "status"; type: "QDeclarativeGeoMapPixmapObject::Status" }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoMapPolygonObject"
+        defaultProperty: "data"
+        prototype: "QDeclarativeGeoMapObject"
+        exports: [
+            "QtMobility.location/MapPolygon 1.2"
+        ]
+        Property { name: "path"; type: "QDeclarativeCoordinate"; isList: true; isReadonly: true }
+        Property { name: "color"; type: "QColor" }
+        Property {
+            name: "border"
+            type: "QDeclarativeGeoMapObjectBorder"
+            isReadonly: true
+            isPointer: true
+        }
+        Signal {
+            name: "colorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal { name: "pathChanged" }
+        Method {
+            name: "addCoordinate"
+            Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
+        }
+        Method {
+            name: "removeCoordinate"
+            Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoMapPolylineObject"
+        defaultProperty: "data"
+        prototype: "QDeclarativeGeoMapObject"
+        exports: [
+            "QtMobility.location/MapPolyline 1.2"
+        ]
+        Property { name: "path"; type: "QDeclarativeCoordinate"; isList: true; isReadonly: true }
+        Property {
+            name: "border"
+            type: "QDeclarativeGeoMapObjectBorder"
+            isReadonly: true
+            isPointer: true
+        }
+        Signal { name: "pathChanged" }
+        Method {
+            name: "addCoordinate"
+            Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
+        }
+        Method {
+            name: "removeCoordinate"
+            Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoMapRectangleObject"
+        defaultProperty: "data"
+        prototype: "QDeclarativeGeoMapObject"
+        exports: [
+            "QtMobility.location/MapRectangle 1.2"
+        ]
+        Property { name: "topLeft"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "bottomRight"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "color"; type: "QColor" }
+        Property {
+            name: "border"
+            type: "QDeclarativeGeoMapObjectBorder"
+            isReadonly: true
+            isPointer: true
+        }
+        Signal {
+            name: "topLeftChanged"
+            Parameter { name: "center"; type: "const QDeclarativeCoordinate"; isPointer: true }
+        }
+        Signal {
+            name: "bottomRightChanged"
+            Parameter { name: "center"; type: "const QDeclarativeCoordinate"; isPointer: true }
+        }
+        Signal {
+            name: "colorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoMapTextObject"
+        defaultProperty: "data"
+        prototype: "QDeclarativeGeoMapObject"
+        exports: [
+            "QtMobility.location/MapText 1.2"
+        ]
+        Enum {
+            name: "HorizontalAlignment"
+            values: {
+                "AlignHCenter": 4,
+                "AlignLeft": 1,
+                "AlignRight": 2
+            }
+        }
+        Enum {
+            name: "VerticalAlignment"
+            values: {
+                "AlignVCenter": 128,
+                "AlignTop": 32,
+                "AlignBottom": 64
+            }
+        }
+        Property { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "text"; type: "string" }
+        Property { name: "font"; type: "QFont" }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "offset"; type: "QPoint" }
+        Property { name: "horizontalAlignment"; type: "HorizontalAlignment" }
+        Property { name: "verticalAlignment"; type: "VerticalAlignment" }
+        Signal {
+            name: "coordinateChanged"
+            Parameter { name: "coordinate"; type: "const QDeclarativeCoordinate"; isPointer: true }
+        }
+        Signal {
+            name: "textChanged"
+            Parameter { name: "text"; type: "string" }
+        }
+        Signal {
+            name: "fontChanged"
+            Parameter { name: "font"; type: "QFont" }
+        }
+        Signal {
+            name: "colorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "offsetChanged"
+            Parameter { name: "offset"; type: "QPoint" }
+        }
+        Signal {
+            name: "horizontalAlignmentChanged"
+            Parameter { name: "alignment"; type: "HorizontalAlignment" }
+        }
+        Signal {
+            name: "verticalAlignmentChanged"
+            Parameter { name: "alignment"; type: "VerticalAlignment" }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoPlace"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/Place 1.1"
+        ]
+        Property { name: "viewport"; type: "QDeclarativeGeoBoundingBox"; isPointer: true }
+        Property { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "address"; type: "QDeclarativeGeoAddress"; isPointer: true }
+        Signal { name: "viewportChanged" }
+        Signal { name: "coordinateChanged" }
+        Signal { name: "addressChanged" }
+    }
+    Component {
+        name: "QDeclarativeGeoServiceProvider"
+        defaultProperty: "parameters"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/Plugin 1.2"
+        ]
+        Property { name: "name"; type: "string" }
+        Property {
+            name: "parameters"
+            type: "QDeclarativeGeoServiceProviderParameter"
+            isList: true
+            isReadonly: true
+        }
+        Signal {
+            name: "nameChanged"
+            Parameter { name: "name"; type: "string" }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoServiceProviderParameter"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/PluginParameter 1.2"
+        ]
+        Property { name: "name"; type: "string" }
+        Property { name: "value"; type: "QVariant" }
+        Signal {
+            name: "nameChanged"
+            Parameter { name: "name"; type: "string" }
+        }
+        Signal {
+            name: "valueChanged"
+            Parameter { name: "value"; type: "QVariant" }
+        }
+    }
+    Component {
+        name: "QDeclarativeGraphicsGeoMap"
+        defaultProperty: "data"
+        prototype: "QDeclarativeItem"
+        exports: [
+            "QtMobility.location/Map 1.2"
+        ]
+        Enum {
+            name: "MapType"
+            values: {
+                "NoMap": 0,
+                "StreetMap": 1,
+                "SatelliteMapDay": 2,
+                "SatelliteMapNight": 3,
+                "TerrainMap": 4
+            }
+        }
+        Enum {
+            name: "ConnectivityMode"
+            values: {
+                "NoConnectivity": 0,
+                "OfflineMode": 1,
+                "OnlineMode": 2,
+                "HybridMode": 3
+            }
+        }
+        Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
+        Property { name: "size"; type: "QSizeF" }
+        Property { name: "minimumZoomLevel"; type: "qreal"; isReadonly: true }
+        Property { name: "maximumZoomLevel"; type: "qreal"; isReadonly: true }
+        Property { name: "zoomLevel"; type: "qreal" }
+        Property { name: "mapType"; type: "MapType" }
+        Property { name: "center"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "connectivityMode"; type: "ConnectivityMode" }
+        Signal {
+            name: "pluginChanged"
+            Parameter { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
+        }
+        Signal {
+            name: "sizeChanged"
+            Parameter { name: "size"; type: "QSizeF" }
+        }
+        Signal {
+            name: "zoomLevelChanged"
+            Parameter { name: "zoomLevel"; type: "qreal" }
+        }
+        Signal {
+            name: "declarativeCenterChanged"
+            Parameter { name: "coordinate"; type: "const QDeclarativeCoordinate"; isPointer: true }
+        }
+        Signal {
+            name: "mapTypeChanged"
+            Parameter { name: "mapType"; type: "QDeclarativeGraphicsGeoMap::MapType" }
+        }
+        Signal {
+            name: "connectivityModeChanged"
+            Parameter { name: "connectivityMode"; type: "QDeclarativeGraphicsGeoMap::ConnectivityMode" }
+        }
+        Method {
+            name: "pan"
+            Parameter { name: "dx"; type: "int" }
+            Parameter { name: "dy"; type: "int" }
+        }
+        Method {
+            name: "addMapObject"
+            Parameter { name: "object"; type: "QDeclarativeGeoMapObject"; isPointer: true }
+        }
+        Method {
+            name: "removeMapObject"
+            Parameter { name: "object"; type: "QDeclarativeGeoMapObject"; isPointer: true }
+        }
+        Method {
+            name: "toCoordinate"
+            type: "QDeclarativeCoordinate*"
+            Parameter { name: "screenPosition"; type: "QPointF" }
+        }
+        Method {
+            name: "toScreenPosition"
+            type: "QPointF"
+            Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
+        }
+        Method { name: "testGetDeclarativeMapObjectCount"; type: "int" }
+    }
+    Component {
+        name: "QDeclarativeLandmark"
+        prototype: "QDeclarativeGeoPlace"
+        exports: [
+            "QtMobility.location/Landmark 1.1"
+        ]
+        Property { name: "name"; type: "string" }
+        Property { name: "phoneNumber"; type: "string" }
+        Property { name: "description"; type: "string" }
+        Property { name: "radius"; type: "double" }
+        Property { name: "iconSource"; type: "QUrl" }
+        Property { name: "url"; type: "QUrl" }
+        Signal { name: "nameChanged" }
+        Signal { name: "phoneNumberChanged" }
+        Signal { name: "descriptionChanged" }
+        Signal { name: "radiusChanged" }
+        Signal { name: "iconSourceChanged" }
+        Signal { name: "urlChanged" }
+        Signal { name: "coordinateChanged" }
+    }
+    Component {
+        name: "QDeclarativeLandmarkAbstractModel"
+        prototype: "QAbstractListModel"
+        exports: [
+            "QtMobility.location/LandmarkAbstractModel 1.1"
+        ]
+        Enum {
+            name: "SortOrder"
+            values: {
+                "AscendingOrder": 0,
+                "DescendingOrder": 1,
+                "NoOrder": 2
+            }
+        }
+        Enum {
+            name: "SortKey"
+            values: {
+                "NoSort": 0,
+                "NameSort": 1
+            }
+        }
+        Property { name: "limit"; type: "int" }
+        Property { name: "offset"; type: "int" }
+        Property { name: "autoUpdate"; type: "bool" }
+        Property { name: "error"; type: "string"; isReadonly: true }
+        Property { name: "sortBy"; type: "SortKey" }
+        Property { name: "sortOrder"; type: "SortOrder" }
+        Signal { name: "sortByChanged" }
+        Signal { name: "sortOrderChanged" }
+        Signal { name: "errorChanged" }
+        Signal { name: "autoUpdateChanged" }
+        Signal { name: "limitChanged" }
+        Signal { name: "offsetChanged" }
+        Signal { name: "modelChanged" }
+        Signal { name: "databaseChanged" }
+        Method { name: "update" }
+        Method {
+            name: "setDbFileName"
+            Parameter { name: "fileName"; type: "string" }
+        }
+    }
+    Component {
+        name: "QDeclarativeLandmarkBoxFilter"
+        prototype: "QDeclarativeLandmarkFilterBase"
+        exports: [
+            "QtMobility.location/LandmarkBoxFilter 1.1"
+        ]
+        Property { name: "topLeft"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "bottomRight"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Signal { name: "topLeftChanged" }
+        Signal { name: "bottomRightChanged" }
+    }
+    Component {
+        name: "QDeclarativeLandmarkCategory"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/LandmarkCategory 1.1"
+        ]
+        Property { name: "name"; type: "string" }
+        Property { name: "iconSource"; type: "QUrl" }
+        Signal { name: "nameChanged" }
+        Signal { name: "iconSourceChanged" }
+    }
+    Component {
+        name: "QDeclarativeLandmarkCategoryFilter"
+        prototype: "QDeclarativeLandmarkFilterBase"
+        exports: [
+            "QtMobility.location/LandmarkCategoryFilter 1.1"
+        ]
+        Property { name: "category"; type: "QDeclarativeLandmarkCategory"; isPointer: true }
+        Signal { name: "categoryChanged" }
+    }
+    Component {
+        name: "QDeclarativeLandmarkCategoryModel"
+        prototype: "QDeclarativeLandmarkAbstractModel"
+        exports: [
+            "QtMobility.location/LandmarkCategoryModel 1.1"
+        ]
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "landmark"; type: "QDeclarativeLandmark"; isPointer: true }
+        Property {
+            name: "categories"
+            type: "QDeclarativeLandmarkCategory"
+            isList: true
+            isReadonly: true
+        }
+        Signal { name: "countChanged" }
+        Signal { name: "landmarkChanged" }
+        Signal { name: "categoriesChanged" }
+    }
+    Component {
+        name: "QDeclarativeLandmarkCompoundFilter"
+        defaultProperty: "filters"
+        prototype: "QDeclarativeLandmarkFilterBase"
+        Property {
+            name: "filters"
+            type: "QDeclarativeLandmarkFilterBase"
+            isList: true
+            isReadonly: true
+        }
+    }
+    Component {
+        name: "QDeclarativeLandmarkFilterBase"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/LandmarkFilterBase 1.1"
+        ]
+        Signal { name: "filterContentChanged" }
+    }
+    Component {
+        name: "QDeclarativeLandmarkIntersectionFilter"
+        defaultProperty: "filters"
+        prototype: "QDeclarativeLandmarkCompoundFilter"
+        exports: [
+            "QtMobility.location/LandmarkIntersectionFilter 1.1"
+        ]
+    }
+    Component {
+        name: "QDeclarativeLandmarkModel"
+        prototype: "QDeclarativeLandmarkAbstractModel"
+        exports: [
+            "QtMobility.location/LandmarkModel 1.1"
+        ]
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "filter"; type: "QDeclarativeLandmarkFilterBase"; isPointer: true }
+        Property { name: "landmarks"; type: "QDeclarativeLandmark"; isList: true; isReadonly: true }
+        Property { name: "importFile"; type: "string" }
+        Signal { name: "countChanged" }
+        Signal { name: "filterChanged" }
+        Signal { name: "landmarksChanged" }
+        Signal { name: "importFileChanged" }
+        Method { name: "importLandmarks" }
+    }
+    Component {
+        name: "QDeclarativeLandmarkNameFilter"
+        prototype: "QDeclarativeLandmarkFilterBase"
+        exports: [
+            "QtMobility.location/LandmarkNameFilter 1.1"
+        ]
+        Property { name: "name"; type: "string" }
+        Signal { name: "nameChanged" }
+    }
+    Component {
+        name: "QDeclarativeLandmarkProximityFilter"
+        prototype: "QDeclarativeLandmarkFilterBase"
+        exports: [
+            "QtMobility.location/LandmarkProximityFilter 1.1"
+        ]
+        Property { name: "center"; type: "QDeclarativeCoordinate"; isPointer: true }
+        Property { name: "radius"; type: "double" }
+        Signal { name: "radiusChanged" }
+        Signal { name: "centerChanged" }
+    }
+    Component {
+        name: "QDeclarativeLandmarkUnionFilter"
+        defaultProperty: "filters"
+        prototype: "QDeclarativeLandmarkCompoundFilter"
+        exports: [
+            "QtMobility.location/LandmarkUnionFilter 1.1"
+        ]
+    }
+    Component {
+        name: "QDeclarativePosition"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/Position 1.1"
+        ]
+        Property { name: "latitudeValid"; type: "bool"; isReadonly: true }
+        Property { name: "longitudeValid"; type: "bool"; isReadonly: true }
+        Property { name: "altitudeValid"; type: "bool"; isReadonly: true }
+        Property { name: "coordinate"; type: "QDeclarativeCoordinate"; isReadonly: true; isPointer: true }
+        Property { name: "timestamp"; type: "QDateTime"; isReadonly: true }
+        Property { name: "speed"; type: "double"; isReadonly: true }
+        Property { name: "speedValid"; type: "bool"; isReadonly: true }
+        Property { name: "horizontalAccuracy"; type: "qreal" }
+        Property { name: "verticalAccuracy"; type: "qreal" }
+        Property { name: "horizontalAccuracyValid"; type: "bool"; isReadonly: true }
+        Property { name: "verticalAccuracyValid"; type: "bool"; isReadonly: true }
+        Signal { name: "latitudeValidChanged" }
+        Signal { name: "longitudeValidChanged" }
+        Signal { name: "altitudeValidChanged" }
+        Signal { name: "timestampChanged" }
+        Signal { name: "speedChanged" }
+        Signal { name: "speedValidChanged" }
+        Signal { name: "coordinateChanged" }
+        Signal { name: "horizontalAccuracyChanged" }
+        Signal { name: "horizontalAccuracyValidChanged" }
+        Signal { name: "verticalAccuracyChanged" }
+        Signal { name: "verticalAccuracyValidChanged" }
+    }
+    Component {
+        name: "QDeclarativePositionSource"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/PositionSource 1.1"
+        ]
+        Enum {
+            name: "PositioningMethod"
+            values: {
+                "NoPositioningMethod": 0,
+                "SatellitePositioningMethod": 255,
+                "NonSatellitePositioningMethod": -256,
+                "AllPositioningMethods": -1
+            }
+        }
+        Property { name: "position"; type: "QDeclarativePosition"; isReadonly: true; isPointer: true }
+        Property { name: "active"; type: "bool" }
+        Property { name: "nmeaSource"; type: "QUrl" }
+        Property { name: "updateInterval"; type: "int" }
+        Property { name: "positioningMethod"; type: "PositioningMethod"; isReadonly: true }
+        Signal { name: "positionChanged" }
+        Signal { name: "activeChanged" }
+        Signal { name: "nmeaSourceChanged" }
+        Signal { name: "updateIntervalChanged" }
+        Signal { name: "positioningMethodChanged" }
+        Method { name: "update" }
+        Method { name: "start" }
+        Method { name: "stop" }
+    }
+    Component {
+        name: "QGeoMapObject"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.location/QGeoMapObject 1.2"
+        ]
+        Property { name: "zValue"; type: "int" }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "selected"; type: "bool" }
+        Property { name: "origin"; type: "QGeoCoordinate"; isReadonly: true }
+        Property { name: "units"; type: "CoordinateUnit"; isReadonly: true }
+        Property { name: "transformType"; type: "TransformType"; isReadonly: true }
+        Signal {
+            name: "zValueChanged"
+            Parameter { name: "zValue"; type: "int" }
+        }
+        Signal {
+            name: "visibleChanged"
+            Parameter { name: "visible"; type: "bool" }
+        }
+        Signal {
+            name: "selectedChanged"
+            Parameter { name: "selected"; type: "bool" }
+        }
+        Signal {
+            name: "originChanged"
+            Parameter { name: "origin"; type: "QGeoCoordinate" }
+        }
+        Signal {
+            name: "unitsChanged"
+            Parameter { name: "units"; type: "QGeoMapObject::CoordinateUnit" }
+        }
+        Signal {
+            name: "transformTypeChanged"
+            Parameter { name: "transformType"; type: "QGeoMapObject::TransformType" }
+        }
+    }
+}
diff --git a/share/qtcreator/qml-type-descriptions/qtmobility-publishsubscribe.qmltypes b/share/qtcreator/qml-type-descriptions/qtmobility-publishsubscribe.qmltypes
index 9612c8614d..e585a61580 100644
--- a/share/qtcreator/qml-type-descriptions/qtmobility-publishsubscribe.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/qtmobility-publishsubscribe.qmltypes
@@ -5,13 +5,33 @@ import QtQuick.tooling 1.0
 
 Module {
     Component {
-        name: "QValueSpaceSubscriber"
+        name: "QDeclarativeValueSpacePublisher"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.publishsubscribe/ValueSpacePublisher 1.2"
+        ]
+        Property { name: "path"; type: "string" }
+        Property { name: "hasSubscribers"; type: "bool"; isReadonly: true }
+        Property { name: "keys"; type: "QStringList" }
+        Property { name: "value"; type: "QVariant" }
+        Property { name: "server"; type: "bool" }
+        Signal { name: "subscribersChanged" }
+    }
+    Component {
+        name: "QDeclarativeValueSpaceSubscriber"
         prototype: "QObject"
         exports: [
             "QtMobility.publishsubscribe/ValueSpaceSubscriber 1.1"
         ]
         Property { name: "path"; type: "string" }
         Property { name: "value"; type: "QVariant"; isReadonly: true }
+        Property { name: "connected"; type: "bool"; isReadonly: true }
+        Property { name: "subPaths"; type: "QStringList"; isReadonly: true }
         Signal { name: "contentsChanged" }
+        Signal { name: "pathChanged" }
+        Method {
+            name: "setPath"
+            Parameter { name: "path"; type: "string" }
+        }
     }
 }
diff --git a/share/qtcreator/qml-type-descriptions/qtmobility-sensors.qmltypes b/share/qtcreator/qml-type-descriptions/qtmobility-sensors.qmltypes
index ac11991cad..a6ea37582a 100644
--- a/share/qtcreator/qml-type-descriptions/qtmobility-sensors.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/qtmobility-sensors.qmltypes
@@ -8,14 +8,16 @@ Module {
         name: "QAccelerometer"
         prototype: "QSensor"
         exports: [
-            "QtMobility.sensors/Accelerometer 1.1"
+            "QtMobility.sensors/Accelerometer 1.1",
+            "QtMobility.sensors/Accelerometer 1.2"
         ]
     }
     Component {
         name: "QAccelerometerReading"
         prototype: "QSensorReading"
         exports: [
-            "QtMobility.sensors/AccelerometerReading 1.1"
+            "QtMobility.sensors/AccelerometerReading 1.1",
+            "QtMobility.sensors/AccelerometerReading 1.2"
         ]
         Property { name: "x"; type: "qreal"; isReadonly: true }
         Property { name: "y"; type: "qreal"; isReadonly: true }
@@ -25,7 +27,8 @@ Module {
         name: "QAmbientLightReading"
         prototype: "QSensorReading"
         exports: [
-            "QtMobility.sensors/AmbientLightReading 1.1"
+            "QtMobility.sensors/AmbientLightReading 1.1",
+            "QtMobility.sensors/AmbientLightReading 1.2"
         ]
         Enum {
             name: "LightLevel"
@@ -44,37 +47,74 @@ Module {
         name: "QAmbientLightSensor"
         prototype: "QSensor"
         exports: [
-            "QtMobility.sensors/AmbientLightSensor 1.1"
+            "QtMobility.sensors/AmbientLightSensor 1.1",
+            "QtMobility.sensors/AmbientLightSensor 1.2"
         ]
     }
     Component {
         name: "QCompass"
         prototype: "QSensor"
         exports: [
-            "QtMobility.sensors/Compass 1.1"
+            "QtMobility.sensors/Compass 1.1",
+            "QtMobility.sensors/Compass 1.2"
         ]
     }
     Component {
         name: "QCompassReading"
         prototype: "QSensorReading"
         exports: [
-            "QtMobility.sensors/CompassReading 1.1"
+            "QtMobility.sensors/CompassReading 1.1",
+            "QtMobility.sensors/CompassReading 1.2"
         ]
         Property { name: "azimuth"; type: "qreal"; isReadonly: true }
         Property { name: "calibrationLevel"; type: "qreal"; isReadonly: true }
     }
     Component {
+        name: "QGyroscope"
+        prototype: "QSensor"
+        exports: [
+            "QtMobility.sensors/Gyroscope 1.2"
+        ]
+    }
+    Component {
+        name: "QGyroscopeReading"
+        prototype: "QSensorReading"
+        exports: [
+            "QtMobility.sensors/GyroscopeReading 1.2"
+        ]
+        Property { name: "x"; type: "qreal"; isReadonly: true }
+        Property { name: "y"; type: "qreal"; isReadonly: true }
+        Property { name: "z"; type: "qreal"; isReadonly: true }
+    }
+    Component {
+        name: "QLightReading"
+        prototype: "QSensorReading"
+        exports: [
+            "QtMobility.sensors/LightReading 1.2"
+        ]
+        Property { name: "lux"; type: "qreal"; isReadonly: true }
+    }
+    Component {
+        name: "QLightSensor"
+        prototype: "QSensor"
+        exports: [
+            "QtMobility.sensors/LightSensor 1.2"
+        ]
+    }
+    Component {
         name: "QMagnetometer"
         prototype: "QSensor"
         exports: [
-            "QtMobility.sensors/Magnetometer 1.1"
+            "QtMobility.sensors/Magnetometer 1.1",
+            "QtMobility.sensors/Magnetometer 1.2"
         ]
     }
     Component {
         name: "QMagnetometerReading"
         prototype: "QSensorReading"
         exports: [
-            "QtMobility.sensors/MagnetometerReading 1.1"
+            "QtMobility.sensors/MagnetometerReading 1.1",
+            "QtMobility.sensors/MagnetometerReading 1.2"
         ]
         Property { name: "x"; type: "qreal"; isReadonly: true }
         Property { name: "y"; type: "qreal"; isReadonly: true }
@@ -85,7 +125,8 @@ Module {
         name: "QOrientationReading"
         prototype: "QSensorReading"
         exports: [
-            "QtMobility.sensors/OrientationReading 1.1"
+            "QtMobility.sensors/OrientationReading 1.1",
+            "QtMobility.sensors/OrientationReading 1.2"
         ]
         Enum {
             name: "Orientation"
@@ -105,14 +146,16 @@ Module {
         name: "QOrientationSensor"
         prototype: "QSensor"
         exports: [
-            "QtMobility.sensors/OrientationSensor 1.1"
+            "QtMobility.sensors/OrientationSensor 1.1",
+            "QtMobility.sensors/OrientationSensor 1.2"
         ]
     }
     Component {
         name: "QProximityReading"
         prototype: "QSensorReading"
         exports: [
-            "QtMobility.sensors/ProximityReading 1.1"
+            "QtMobility.sensors/ProximityReading 1.1",
+            "QtMobility.sensors/ProximityReading 1.2"
         ]
         Property { name: "close"; type: "bool"; isReadonly: true }
     }
@@ -120,14 +163,16 @@ Module {
         name: "QProximitySensor"
         prototype: "QSensor"
         exports: [
-            "QtMobility.sensors/ProximitySensor 1.1"
+            "QtMobility.sensors/ProximitySensor 1.1",
+            "QtMobility.sensors/ProximitySensor 1.2"
         ]
     }
     Component {
         name: "QRotationReading"
         prototype: "QSensorReading"
         exports: [
-            "QtMobility.sensors/RotationReading 1.1"
+            "QtMobility.sensors/RotationReading 1.1",
+            "QtMobility.sensors/RotationReading 1.2"
         ]
         Property { name: "x"; type: "qreal"; isReadonly: true }
         Property { name: "y"; type: "qreal"; isReadonly: true }
@@ -137,7 +182,8 @@ Module {
         name: "QRotationSensor"
         prototype: "QSensor"
         exports: [
-            "QtMobility.sensors/RotationSensor 1.1"
+            "QtMobility.sensors/RotationSensor 1.1",
+            "QtMobility.sensors/RotationSensor 1.2"
         ]
     }
     Component {
@@ -162,6 +208,7 @@ Module {
             name: "sensorError"
             Parameter { name: "error"; type: "int" }
         }
+        Signal { name: "availableSensorsChanged" }
         Method { name: "start"; type: "bool" }
         Method { name: "stop" }
         Method { name: "connectToBackend"; type: "bool" }
@@ -175,7 +222,8 @@ Module {
         name: "QTapReading"
         prototype: "QSensorReading"
         exports: [
-            "QtMobility.sensors/TapReading 1.1"
+            "QtMobility.sensors/TapReading 1.1",
+            "QtMobility.sensors/TapReading 1.2"
         ]
         Enum {
             name: "TapDirection"
@@ -189,7 +237,10 @@ Module {
                 "Z_Pos": 68,
                 "X_Neg": 257,
                 "Y_Neg": 514,
-                "Z_Neg": 1028
+                "Z_Neg": 1028,
+                "X_Both": 273,
+                "Y_Both": 546,
+                "Z_Both": 1092
             }
         }
         Property { name: "tapDirection"; type: "TapDirection"; isReadonly: true }
@@ -199,7 +250,8 @@ Module {
         name: "QTapSensor"
         prototype: "QSensor"
         exports: [
-            "QtMobility.sensors/TapSensor 1.1"
+            "QtMobility.sensors/TapSensor 1.1",
+            "QtMobility.sensors/TapSensor 1.2"
         ]
     }
 }
diff --git a/share/qtcreator/qml-type-descriptions/qtmobility-serviceframework.qmltypes b/share/qtcreator/qml-type-descriptions/qtmobility-serviceframework.qmltypes
index 0d74d7750b..ffc82a9e9d 100644
--- a/share/qtcreator/qml-type-descriptions/qtmobility-serviceframework.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/qtmobility-serviceframework.qmltypes
@@ -42,6 +42,7 @@ Module {
         Property { name: "minorVersion"; type: "int" }
         Property { name: "services"; type: "QDeclarativeService"; isList: true; isReadonly: true }
         Property { name: "versionMatch"; type: "MatchRule" }
+        Signal { name: "resultsChanged" }
         Signal {
             name: "servicesChanged"
             Parameter { type: "QDeclarativeService"; isList: true }
diff --git a/share/qtcreator/qml-type-descriptions/qtmobility-systeminfo.qmltypes b/share/qtcreator/qml-type-descriptions/qtmobility-systeminfo.qmltypes
index d271fd2168..4f9473187a 100644
--- a/share/qtcreator/qml-type-descriptions/qtmobility-systeminfo.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/qtmobility-systeminfo.qmltypes
@@ -5,36 +5,68 @@ import QtQuick.tooling 1.0
 
 Module {
     Component {
+        name: "QDeclarativeBatteryInfo"
+        prototype: "QSystemBatteryInfo"
+        exports: [
+            "QtMobility.systeminfo/BatteryInfo 1.2"
+        ]
+        Property { name: "monitorBatteryStatusChanges"; type: "bool" }
+        Property { name: "monitorChargingStateChanges"; type: "bool" }
+        Property { name: "monitorChargerTypeChanges"; type: "bool" }
+        Property { name: "monitorNominalCapacityChanges"; type: "bool" }
+        Property { name: "monitorRemainingCapacityPercentChanges"; type: "bool" }
+        Property { name: "monitorRemainingCapacityChanges"; type: "bool" }
+        Property { name: "monitorCurrentFlowChanges"; type: "bool" }
+        Property { name: "monitorRemainingCapacityBarsChanges"; type: "bool" }
+        Property { name: "monitorRemainingChargingTimeChanges"; type: "bool" }
+    }
+    Component {
         name: "QDeclarativeDeviceInfo"
         prototype: "QSystemDeviceInfo"
         exports: [
             "QtMobility.systeminfo/DeviceInfo 1.1"
         ]
-        Signal {
-            name: "batteryLevelChanged"
-            Parameter { name: "level"; type: "int" }
-        }
-        Signal {
-            name: "batteryStatusChanged"
-            Parameter { name: "batteryStatus"; type: "QSystemDeviceInfo::BatteryStatus" }
-        }
-        Signal {
-            name: "powerStateChanged"
-            Parameter { name: "powerState"; type: "QSystemDeviceInfo::PowerState" }
-        }
-        Signal {
-            name: "currentProfileChanged"
-            Parameter { name: "currentProfile"; type: "QSystemDeviceInfo::Profile" }
+        Property { name: "monitorBatteryLevelChanges"; type: "bool" }
+        Property { name: "monitorBatteryStatusChanges"; type: "bool" }
+        Property { name: "monitorPowerStateChanges"; type: "bool" }
+        Property { name: "monitorCurrentProfileChanges"; type: "bool" }
+        Property { name: "monitorBluetoothStateChanges"; type: "bool" }
+        Property { name: "monitorThermalStateChanges"; type: "bool" }
+        Property { name: "monitorWirelessKeyboardConnects"; type: "bool" }
+        Property { name: "monitorKeyboardFlips"; type: "bool" }
+        Property { name: "monitorDeviceLocks"; type: "bool" }
+        Property { name: "monitorLockStatusChanges"; type: "bool" }
+        Property { name: "messageRingtoneVolume"; type: "int"; isReadonly: true }
+        Property { name: "voiceRingtoneVolume"; type: "int"; isReadonly: true }
+        Property { name: "vibrationActive"; type: "bool"; isReadonly: true }
+        Property { name: "primaryKeypadLightOn"; type: "bool"; isReadonly: true }
+        Property { name: "secondaryKeypadLightOn"; type: "bool"; isReadonly: true }
+    }
+    Component {
+        name: "QDeclarativeDisplayInfo"
+        prototype: "QSystemDisplayInfo"
+        exports: [
+            "QtMobility.systeminfo/DisplayInfo 1.1"
+        ]
+        Property { name: "screen"; type: "int" }
+        Property { name: "displayBrightness"; type: "int"; isReadonly: true }
+        Property { name: "colorDepth"; type: "int"; isReadonly: true }
+        Property {
+            name: "orientation"
+            type: "QSystemDisplayInfo::DisplayOrientation"
+            isReadonly: true
         }
-        Signal {
-            name: "bluetoothStateChanged"
-            Parameter { name: "on"; type: "bool" }
+        Property { name: "contrast"; type: "float"; isReadonly: true }
+        Property { name: "dpiWidth"; type: "int"; isReadonly: true }
+        Property { name: "dpiHeight"; type: "int"; isReadonly: true }
+        Property { name: "physicalWidth"; type: "int"; isReadonly: true }
+        Property { name: "physicalHeight"; type: "int"; isReadonly: true }
+        Property {
+            name: "backlightStatus"
+            type: "QSystemDisplayInfo::BacklightState"
+            isReadonly: true
         }
-        Method { name: "startBatteryLevelChanged" }
-        Method { name: "startBatteryStatusChanged" }
-        Method { name: "startPowerStateChanged" }
-        Method { name: "startCurrentProfileChanged" }
-        Method { name: "startBluetoothStateChanged" }
+        Signal { name: "orientationChanged" }
     }
     Component {
         name: "QDeclarativeGeneralInfo"
@@ -42,11 +74,19 @@ Module {
         exports: [
             "QtMobility.systeminfo/GeneralInfo 1.1"
         ]
+        Property { name: "osVersion"; type: "string"; isReadonly: true }
+        Property { name: "qtCoreVersion"; type: "string"; isReadonly: true }
+        Property { name: "firmwareVersion"; type: "string"; isReadonly: true }
+        Property { name: "qtMobilityVersion"; type: "string"; isReadonly: true }
         Signal {
             name: "currentLanguageChanged"
             Parameter { name: "language"; type: "string" }
         }
         Method { name: "startCurrentLanguageChanged" }
+        Method { name: "osVersion"; type: "string" }
+        Method { name: "qtCoreVersion"; type: "string" }
+        Method { name: "firmwareVersion"; type: "string" }
+        Method { name: "qtMobilityVersion"; type: "string" }
     }
     Component {
         name: "QDeclarativeNetworkInfo"
@@ -64,6 +104,14 @@ Module {
             type: "QList<QSystemNetworkInfo::NetworkMode>"
             isReadonly: true
         }
+        Property { name: "monitorStatusChanges"; type: "bool" }
+        Property { name: "monitorSignalStrengthChanges"; type: "bool" }
+        Property { name: "monitorNameChanges"; type: "bool" }
+        Property { name: "monitorModeChanges"; type: "bool" }
+        Property { name: "monitorCurrentMobileCountryCodeChanges"; type: "bool" }
+        Property { name: "monitorCurrentMobileNetworkCodeChanges"; type: "bool" }
+        Property { name: "monitorCellDataChanges"; type: "bool" }
+        Property { name: "monitorCellIdChanges"; type: "bool" }
         Signal {
             name: "statusChanged"
             Parameter { name: "newStatus"; type: "string" }
@@ -85,13 +133,15 @@ Module {
             name: "currentMobileNetworkCodeChanged"
             Parameter { name: "newMnc"; type: "string" }
         }
+        Signal {
+            name: "cellIdChanges"
+            Parameter { name: "cellId"; type: "int" }
+        }
+        Signal {
+            name: "cellDataTechnologyChanges"
+            Parameter { name: "cellTech"; type: "QSystemNetworkInfo::CellDataTechnology" }
+        }
         Method { name: "interfaceForMode"; type: "QNetworkInterface" }
-        Method { name: "startStatusChanged" }
-        Method { name: "startSignalStrengthChanged" }
-        Method { name: "startNameChanged" }
-        Method { name: "startModeChanged" }
-        Method { name: "startCurrentMobileCountryCodeChanged" }
-        Method { name: "startCurrentMobileNetworkCodeChanged" }
         Method { name: "availableModes"; type: "QList<QSystemNetworkInfo::NetworkMode>" }
     }
     Component {
@@ -101,7 +151,7 @@ Module {
             "QtMobility.systeminfo/ScreenSaver 1.1"
         ]
         Property { name: "screenSaverDelayed"; type: "bool" }
-        Property { name: "screenSaverInhibited"; type: "bool"; isReadonly: true }
+        Property { name: "screenSaverInhibited"; type: "bool" }
         Method {
             name: "setScreenSaverDelayed"
             Parameter { name: "on"; type: "bool" }
@@ -109,6 +159,129 @@ Module {
         Method { name: "setScreenSaverInhibit"; type: "bool" }
     }
     Component {
+        name: "QSystemAlignedTimer"
+        prototype: "QObject"
+        exports: [
+            "QtMobility.systeminfo/AlignedTimer 1.2"
+        ]
+        Property { name: "minimumInterval"; type: "int" }
+        Property { name: "maximumInterval"; type: "int" }
+        Property { name: "singleShot"; type: "bool" }
+        Property { name: "active"; type: "bool"; isReadonly: true }
+        Signal { name: "timeout" }
+        Signal {
+            name: "error"
+            Parameter { name: "error"; type: "QSystemAlignedTimer::AlignedTimerError" }
+        }
+        Method {
+            name: "start"
+            Parameter { name: "minimumTime"; type: "int" }
+            Parameter { name: "maximumTime"; type: "int" }
+        }
+        Method { name: "start" }
+        Method { name: "stop" }
+        Method { name: "wokeUp" }
+        Method {
+            name: "singleShot"
+            Parameter { name: "minimumTime"; type: "int" }
+            Parameter { name: "maximumTime"; type: "int" }
+            Parameter { name: "receiver"; type: "QObject"; isPointer: true }
+            Parameter { name: "member"; type: "const char"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QSystemBatteryInfo"
+        prototype: "QObject"
+        Enum {
+            name: "BatteryStatus"
+            values: {
+                "BatteryUnknown": -1,
+                "BatteryEmpty": 0,
+                "BatteryCritical": 1,
+                "BatteryVeryLow": 2,
+                "BatteryLow": 3,
+                "BatteryOk": 4,
+                "BatteryFull": 5
+            }
+        }
+        Enum {
+            name: "ChargingState"
+            values: {
+                "ChargingError": -1,
+                "NotCharging": 0,
+                "Charging": 1
+            }
+        }
+        Enum {
+            name: "ChargerType"
+            values: {
+                "UnknownCharger": -1,
+                "NoCharger": 0,
+                "WallCharger": 1,
+                "USBCharger": 2,
+                "USB_500mACharger": 3,
+                "USB_100mACharger": 4,
+                "VariableCurrentCharger": 5
+            }
+        }
+        Enum {
+            name: "EnergyUnit"
+            values: {
+                "UnitUnknown": -1,
+                "UnitmAh": 0,
+                "UnitmWh": 1
+            }
+        }
+        Property { name: "nominalCapacity"; type: "int"; isReadonly: true }
+        Property { name: "remainingCapacityPercent"; type: "int"; isReadonly: true }
+        Property { name: "remainingCapacity"; type: "int"; isReadonly: true }
+        Property { name: "voltage"; type: "int"; isReadonly: true }
+        Property { name: "remainingChargingTime"; type: "int"; isReadonly: true }
+        Property { name: "currentFlow"; type: "int"; isReadonly: true }
+        Property { name: "remainingCapacityBars"; type: "int"; isReadonly: true }
+        Property { name: "maxBars"; type: "int"; isReadonly: true }
+        Property { name: "chargerType"; type: "ChargerType"; isReadonly: true }
+        Property { name: "chargingState"; type: "ChargingState"; isReadonly: true }
+        Property { name: "energyMeasurementUnit"; type: "EnergyUnit"; isReadonly: true }
+        Property { name: "batteryStatus"; type: "BatteryStatus"; isReadonly: true }
+        Signal {
+            name: "batteryStatusChanged"
+            Parameter { name: "batteryStatus"; type: "QSystemBatteryInfo::BatteryStatus" }
+        }
+        Signal {
+            name: "chargingStateChanged"
+            Parameter { name: "chargingState"; type: "QSystemBatteryInfo::ChargingState" }
+        }
+        Signal {
+            name: "chargerTypeChanged"
+            Parameter { name: "chargerType"; type: "QSystemBatteryInfo::ChargerType" }
+        }
+        Signal {
+            name: "nominalCapacityChanged"
+            Parameter { name: "cap"; type: "int" }
+        }
+        Signal {
+            name: "remainingCapacityPercentChanged"
+            Parameter { name: "level"; type: "int" }
+        }
+        Signal {
+            name: "remainingCapacityChanged"
+            Parameter { name: "level"; type: "int" }
+        }
+        Signal {
+            name: "currentFlowChanged"
+            Parameter { name: "level"; type: "int" }
+        }
+        Signal {
+            name: "remainingCapacityBarsChanged"
+            Parameter { name: "bars"; type: "int" }
+        }
+        Signal {
+            name: "remainingChargingTimeChanged"
+            Parameter { name: "time"; type: "int" }
+        }
+    }
+    Component {
         name: "QSystemDeviceInfo"
         prototype: "QObject"
         Enum {
@@ -131,6 +304,16 @@ Module {
             }
         }
         Enum {
+            name: "ThermalState"
+            values: {
+                "UnknownThermal": 0,
+                "NormalThermal": 1,
+                "WarningThermal": 2,
+                "AlertThermal": 3,
+                "ErrorThermal": 4
+            }
+        }
+        Enum {
             name: "InputMethod"
             values: {
                 "Keys": 1,
@@ -175,11 +358,63 @@ Module {
                 "SimLocked": 3
             }
         }
+        Enum {
+            name: "KeyboardType"
+            values: {
+                "UnknownKeyboard": 0,
+                "SoftwareKeyboard": 1,
+                "ITUKeypad": 2,
+                "HalfQwertyKeyboard": 4,
+                "FullQwertyKeyboard": 8,
+                "WirelessKeyboard": 16,
+                "FlipKeyboard": 32
+            }
+        }
+        Enum {
+            name: "KeyboardTypeFlags"
+            values: {
+                "UnknownKeyboard": 0,
+                "SoftwareKeyboard": 1,
+                "ITUKeypad": 2,
+                "HalfQwertyKeyboard": 4,
+                "FullQwertyKeyboard": 8,
+                "WirelessKeyboard": 16,
+                "FlipKeyboard": 32
+            }
+        }
+        Enum {
+            name: "KeypadType"
+            values: {
+                "PrimaryKeypad": 0,
+                "SecondaryKeypad": 1
+            }
+        }
+        Enum {
+            name: "LockType"
+            values: {
+                "UnknownLock": 0,
+                "PinLocked": 1,
+                "TouchAndKeyboardLocked": 2
+            }
+        }
+        Enum {
+            name: "LockTypeFlags"
+            values: {
+                "UnknownLock": 0,
+                "PinLocked": 1,
+                "TouchAndKeyboardLocked": 2
+            }
+        }
         Property { name: "currentProfile"; type: "Profile"; isReadonly: true }
-        Property { name: "powerState"; type: "PowerState"; isReadonly: true }
+        Property { name: "currentPowerState"; type: "PowerState"; isReadonly: true }
+        Property { name: "currentThermalState"; type: "ThermalState"; isReadonly: true }
         Property { name: "simStatus"; type: "SimStatus"; isReadonly: true }
         Property { name: "batteryStatus"; type: "BatteryStatus"; isReadonly: true }
-        Property { name: "inputMethodType"; type: "InputMethodFlags"; isReadonly: true }
+        Property {
+            name: "inputMethodType"
+            type: "QSystemDeviceInfo::InputMethodFlags"
+            isReadonly: true
+        }
         Property { name: "imei"; type: "string"; isReadonly: true }
         Property { name: "imsi"; type: "string"; isReadonly: true }
         Property { name: "manufacturer"; type: "string"; isReadonly: true }
@@ -188,7 +423,11 @@ Module {
         Property { name: "batteryLevel"; type: "int"; isReadonly: true }
         Property { name: "isDeviceLocked"; type: "bool"; isReadonly: true }
         Property { name: "currentBluetoothPowerState"; type: "bool"; isReadonly: true }
-        Property { name: "currentPowerState"; type: "QSystemDeviceInfo::PowerState"; isReadonly: true }
+        Property { name: "keyboardTypes"; type: "KeyboardTypeFlags"; isReadonly: true }
+        Property { name: "isWirelessKeyboardConnected"; type: "bool"; isReadonly: true }
+        Property { name: "isKeyboardFlippedOpen"; type: "bool"; isReadonly: true }
+        Property { name: "lockStatus"; type: "QSystemDeviceInfo::LockTypeFlags"; isReadonly: true }
+        Property { name: "uniqueDeviceID"; type: "QByteArray"; isReadonly: true }
         Signal {
             name: "batteryLevelChanged"
             Parameter { name: "level"; type: "int" }
@@ -202,6 +441,10 @@ Module {
             Parameter { name: "powerState"; type: "QSystemDeviceInfo::PowerState" }
         }
         Signal {
+            name: "thermalStateChanged"
+            Parameter { name: "thermalState"; type: "QSystemDeviceInfo::ThermalState" }
+        }
+        Signal {
             name: "currentProfileChanged"
             Parameter { name: "currentProfile"; type: "QSystemDeviceInfo::Profile" }
         }
@@ -209,13 +452,55 @@ Module {
             name: "bluetoothStateChanged"
             Parameter { name: "on"; type: "bool" }
         }
+        Signal {
+            name: "wirelessKeyboardConnected"
+            Parameter { name: "connected"; type: "bool" }
+        }
+        Signal {
+            name: "keyboardFlipped"
+            Parameter { name: "open"; type: "bool" }
+        }
+        Signal {
+            name: "deviceLocked"
+            Parameter { name: "isLocked"; type: "bool" }
+        }
+        Signal {
+            name: "lockStatusChanged"
+            Parameter { type: "QSystemDeviceInfo::LockTypeFlags" }
+        }
+        Method {
+            name: "keypadLightOn"
+            type: "bool"
+            Parameter { name: "type"; type: "QSystemDeviceInfo::KeypadType" }
+        }
+        Method { name: "activeProfileDetails"; type: "ProfileDetails" }
     }
     Component {
         name: "QSystemDisplayInfo"
         prototype: "QObject"
-        exports: [
-            "QtMobility.systeminfo/DisplayInfo 1.1"
-        ]
+        Enum {
+            name: "DisplayOrientation"
+            values: {
+                "Unknown": 0,
+                "Landscape": 1,
+                "Portrait": 2,
+                "InvertedLandscape": 3,
+                "InvertedPortrait": 4
+            }
+        }
+        Enum {
+            name: "BacklightState"
+            values: {
+                "BacklightStateUnknown": -1,
+                "BacklightStateOff": 0,
+                "BacklightStateDimmed": 1,
+                "BacklightStateOn": 2
+            }
+        }
+        Signal {
+            name: "orientationChanged"
+            Parameter { name: "newOrientation"; type: "QSystemDisplayInfo::DisplayOrientation" }
+        }
     }
     Component {
         name: "QSystemInfo"
@@ -244,7 +529,8 @@ Module {
                 "SimFeature": 9,
                 "LocationFeature": 10,
                 "VideoOutFeature": 11,
-                "HapticsFeature": 12
+                "HapticsFeature": 12,
+                "FmTransmitterFeature": 13
             }
         }
         Property { name: "currentLanguage"; type: "string"; isReadonly: true }
@@ -252,7 +538,12 @@ Module {
         Property { name: "currentCountryCode"; type: "string"; isReadonly: true }
         Signal {
             name: "currentLanguageChanged"
-            Parameter { type: "string" }
+            Parameter { name: "lang"; type: "string" }
+        }
+        Method {
+            name: "hasFeatureSupported"
+            type: "bool"
+            Parameter { name: "feature"; type: "QSystemInfo::Feature" }
         }
     }
     Component {
@@ -282,7 +573,18 @@ Module {
                 "WlanMode": 4,
                 "EthernetMode": 5,
                 "BluetoothMode": 6,
-                "WimaxMode": 7
+                "WimaxMode": 7,
+                "LteMode": 8
+            }
+        }
+        Enum {
+            name: "CellDataTechnology"
+            values: {
+                "UnknownDataTechnology": 0,
+                "GprsDataTechnology": 1,
+                "EdgeDataTechnology": 2,
+                "UmtsDataTechnology": 3,
+                "HspaDataTechnology": 4
             }
         }
         Property { name: "cellId"; type: "int"; isReadonly: true }
@@ -292,32 +594,45 @@ Module {
         Property { name: "homeMobileCountryCode"; type: "string"; isReadonly: true }
         Property { name: "homeMobileNetworkCode"; type: "string"; isReadonly: true }
         Property { name: "currentMode"; type: "QSystemNetworkInfo::NetworkMode"; isReadonly: true }
+        Property {
+            name: "cellDataTechnology"
+            type: "QSystemNetworkInfo::CellDataTechnology"
+            isReadonly: true
+        }
         Signal {
             name: "networkStatusChanged"
-            Parameter { type: "QSystemNetworkInfo::NetworkMode" }
-            Parameter { type: "QSystemNetworkInfo::NetworkStatus" }
+            Parameter { name: "mode"; type: "QSystemNetworkInfo::NetworkMode" }
+            Parameter { name: "status"; type: "QSystemNetworkInfo::NetworkStatus" }
         }
         Signal {
             name: "networkSignalStrengthChanged"
-            Parameter { type: "QSystemNetworkInfo::NetworkMode" }
-            Parameter { type: "int" }
+            Parameter { name: "mode"; type: "QSystemNetworkInfo::NetworkMode" }
+            Parameter { name: "strength"; type: "int" }
         }
         Signal {
             name: "currentMobileCountryCodeChanged"
-            Parameter { type: "string" }
+            Parameter { name: "mcc"; type: "string" }
         }
         Signal {
             name: "currentMobileNetworkCodeChanged"
-            Parameter { type: "string" }
+            Parameter { name: "mnc"; type: "string" }
         }
         Signal {
             name: "networkNameChanged"
-            Parameter { type: "QSystemNetworkInfo::NetworkMode" }
-            Parameter { type: "string" }
+            Parameter { name: "mode"; type: "QSystemNetworkInfo::NetworkMode" }
+            Parameter { name: "name"; type: "string" }
         }
         Signal {
             name: "networkModeChanged"
-            Parameter { type: "QSystemNetworkInfo::NetworkMode" }
+            Parameter { name: "mode"; type: "QSystemNetworkInfo::NetworkMode" }
+        }
+        Signal {
+            name: "cellIdChanged"
+            Parameter { name: "cellId"; type: "int" }
+        }
+        Signal {
+            name: "cellDataTechnologyChanged"
+            Parameter { name: "cellTech"; type: "QSystemNetworkInfo::CellDataTechnology" }
         }
         Method {
             name: "networkStatus"
@@ -340,6 +655,11 @@ Module {
             type: "string"
             Parameter { name: "mode"; type: "QSystemNetworkInfo::NetworkMode" }
         }
+        Method {
+            name: "interfaceForMode"
+            type: "QNetworkInterface"
+            Parameter { name: "mode"; type: "QSystemNetworkInfo::NetworkMode" }
+        }
     }
     Component {
         name: "QSystemStorageInfo"
@@ -354,7 +674,19 @@ Module {
                 "InternalDrive": 1,
                 "RemovableDrive": 2,
                 "RemoteDrive": 3,
-                "CdromDrive": 4
+                "CdromDrive": 4,
+                "InternalFlashDrive": 5,
+                "RamDrive": 6
+            }
+        }
+        Enum {
+            name: "StorageState"
+            values: {
+                "UnknownStorageState": 0,
+                "NormalStorageState": 1,
+                "LowStorageState": 2,
+                "VeryLowStorageState": 3,
+                "CriticalStorageState": 4
             }
         }
         Property { name: "logicalDrives"; type: "QStringList"; isReadonly: true }
@@ -363,6 +695,11 @@ Module {
             Parameter { name: "added"; type: "bool" }
             Parameter { name: "vol"; type: "string" }
         }
+        Signal {
+            name: "storageStateChanged"
+            Parameter { name: "vol"; type: "string" }
+            Parameter { name: "state"; type: "QSystemStorageInfo::StorageState" }
+        }
         Method {
             name: "totalDiskSpace"
             type: "qlonglong"
@@ -378,5 +715,15 @@ Module {
             type: "QSystemStorageInfo::DriveType"
             Parameter { name: "driveVolume"; type: "string" }
         }
+        Method {
+            name: "uriForDrive"
+            type: "string"
+            Parameter { name: "driveVolume"; type: "string" }
+        }
+        Method {
+            name: "getStorageState"
+            type: "QSystemStorageInfo::StorageState"
+            Parameter { name: "volume"; type: "string" }
+        }
     }
 }