Merge lp:~aacid/unity8/update_qmltypes into lp:unity8

[Albert Astals Cid]

Update qmltypes

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
No, it's q qmltypes update

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1612
http://jenkins.qa.ubuntu.com/job/unity8-ci/5317/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/482
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/482
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1347
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18044

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5317/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
n
 * Did CI run pass? If not, please explain why.
autopilot
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve

=== modified file 'plugins/AccountsService/AccountsService.qmltypes'
--- plugins/AccountsService/AccountsService.qmltypes	2014-10-07 10:58:39 +0000
+++ plugins/AccountsService/AccountsService.qmltypes	2015-02-13 09:02:58 +0000
@@ -29,5 +29,8 @@
         Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
         Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
         Property { name: "failedLogins"; type: "uint" }
+        Property { name: "hereEnabled"; type: "bool" }
+        Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
+        Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
     }
 }

=== modified file 'plugins/Dash/Dash.qmltypes'
--- plugins/Dash/Dash.qmltypes	2014-10-07 10:58:39 +0000
+++ plugins/Dash/Dash.qmltypes	2015-02-13 09:02:58 +0000
@@ -15,10 +15,26 @@
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
         Property { name: "columnSpacing"; type: "double" }
         Property { name: "rowSpacing"; type: "double" }
+        Property { name: "cacheBuffer"; type: "int" }
         Property { name: "displayMarginBeginning"; type: "double" }
         Property { name: "displayMarginEnd"; type: "double" }
     }
     Component {
+        name: "CroppedImageSizer"
+        prototype: "QObject"
+        exports: ["Dash/CroppedImageSizer 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "source"; type: "QUrl" }
+        Property { name: "width"; type: "double" }
+        Property { name: "height"; type: "double" }
+        Property { name: "sourceSize"; type: "QSize"; isReadonly: true }
+        Signal { name: "inputParamsChanged" }
+        Method {
+            name: "setImageSize"
+            Parameter { name: "imageSize"; type: "QSize" }
+        }
+    }
+    Component {
         name: "HorizontalJournal"
         defaultProperty: "data"
         prototype: "AbstractDashView"
@@ -40,7 +56,7 @@
         Property { name: "forceNoClip"; type: "bool" }
         Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }
         Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }
-        Property { name: "cacheBuffer"; type: "double" }
+        Property { name: "cacheBuffer"; type: "int" }
         Signal { name: "headerChanged" }
         Method { name: "positionAtBeginning" }
         Method { name: "showHeader" }

=== modified file 'plugins/Greeter/Unity/Launcher/Launcher.qmltypes'
--- plugins/Greeter/Unity/Launcher/Launcher.qmltypes	2014-12-12 10:00:31 +0000
+++ plugins/Greeter/Unity/Launcher/Launcher.qmltypes	2015-02-13 09:02:58 +0000
@@ -4,7 +4,7 @@
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins'
+// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins/Greeter'
 
 Module {
     Component {
@@ -25,6 +25,7 @@
             name: "requestRemove"
             Parameter { name: "appId"; type: "string" }
         }
+        Method { name: "refresh" }
         Method {
             name: "get"
             type: "unity::shell::launcher::LauncherItemInterface*"
@@ -136,6 +137,8 @@
             type: "unity::shell::application::ApplicationManagerInterface"
             isPointer: true
         }
+        Property { name: "onlyPinned"; type: "bool" }
+        Signal { name: "hint" }
         Method {
             name: "move"
             Parameter { name: "oldIndex"; type: "int" }

=== modified file 'plugins/LightDM/LightDM.qmltypes'
--- plugins/LightDM/LightDM.qmltypes	2014-10-07 10:58:39 +0000
+++ plugins/LightDM/LightDM.qmltypes	2015-02-13 09:02:58 +0000
@@ -114,7 +114,7 @@
         Method { name: "invalidate" }
     }
     Component {
-        name: "QSortFilterProxyModelQML"
+        name: "UnitySortFilterProxyModelQML"
         prototype: "QSortFilterProxyModel"
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "totalCount"; type: "int"; isReadonly: true }
@@ -242,7 +242,7 @@
     }
     Component {
         name: "UsersModel"
-        prototype: "QSortFilterProxyModelQML"
+        prototype: "UnitySortFilterProxyModelQML"
         exports: ["LightDM/Users 0.1"]
         isCreatable: false
         isSingleton: true

=== modified file 'plugins/ScreenGrabber/ScreenGrabber.qmltypes'
--- plugins/ScreenGrabber/ScreenGrabber.qmltypes	2014-09-27 02:16:11 +0000
+++ plugins/ScreenGrabber/ScreenGrabber.qmltypes	2015-02-13 09:02:58 +0000
@@ -4,7 +4,7 @@
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable ScreenGrabber 0.1 plugins'
+// 'qmlplugindump -notrelocatable ScreenGrabber 0.1 plugins'
 
 Module {
     Component {

=== modified file 'plugins/Ubuntu/Gestures/Gestures.qmltypes'
--- plugins/Ubuntu/Gestures/Gestures.qmltypes	2014-07-10 10:59:08 +0000
+++ plugins/Ubuntu/Gestures/Gestures.qmltypes	2015-02-13 09:02:58 +0000
@@ -33,7 +33,8 @@
                 "Rightwards": 0,
                 "Leftwards": 1,
                 "Downwards": 2,
-                "Upwards": 3
+                "Upwards": 3,
+                "Horizontal": 4
             }
         }
         Method {
@@ -151,4 +152,17 @@
         exportMetaObjectRevisions: [0]
         Signal { name: "pressedOutside" }
     }
+    Component {
+        name: "TouchGate"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        exports: ["Ubuntu.Gestures/TouchGate 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "targetItem"; type: "QQuickItem"; isPointer: true }
+        Signal {
+            name: "targetItemChanged"
+            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
+        }
+        Signal { name: "pressed" }
+    }
 }

=== modified file 'plugins/Unity/Indicators/Indicators.qmltypes'
--- plugins/Unity/Indicators/Indicators.qmltypes	2014-11-11 15:28:13 +0000
+++ plugins/Unity/Indicators/Indicators.qmltypes	2015-02-13 09:02:58 +0000
@@ -55,11 +55,16 @@
         exports: ["Unity.Indicators/IndicatorsManager 0.1"]
         exportMetaObjectRevisions: [0]
         Property { name: "loaded"; type: "bool"; isReadonly: true }
+        Property { name: "profile"; type: "string" }
         Signal {
             name: "loadedChanged"
             Parameter { type: "bool" }
         }
         Signal {
+            name: "profileChanged"
+            Parameter { type: "string" }
+        }
+        Signal {
             name: "indicatorLoaded"
             Parameter { name: "indicator_name"; type: "string" }
         }
@@ -67,10 +72,7 @@
             name: "indicatorAboutToBeUnloaded"
             Parameter { name: "indicator_name"; type: "string" }
         }
-        Method {
-            name: "load"
-            Parameter { name: "profile"; type: "string" }
-        }
+        Method { name: "load" }
         Method { name: "unload" }
     }
     Component {
@@ -79,14 +81,12 @@
         exports: ["Unity.Indicators/IndicatorsModel 0.1"]
         exportMetaObjectRevisions: [0]
         Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "profile"; type: "string" }
         Signal {
             name: "indicatorDataChanged"
             Parameter { name: "data"; type: "QVariant" }
         }
-        Method {
-            name: "load"
-            Parameter { name: "profile"; type: "string" }
-        }
+        Method { name: "load" }
         Method { name: "unload" }
         Method {
             name: "data"
@@ -106,8 +106,7 @@
             values: {
                 "Identifier": 0,
                 "Position": 1,
-                "IndicatorProperties": 2,
-                "IsVisible": 3
+                "IndicatorProperties": 2
             }
         }
     }
@@ -201,12 +200,6 @@
         }
     }
     Component {
-        name: "QAbstractProxyModel"
-        prototype: "QAbstractItemModel"
-        Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
-    }
-    Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
-    Component {
         name: "RootStateObject"
         prototype: "QObject"
         Property { name: "valid"; type: "bool"; isReadonly: true }
@@ -215,7 +208,7 @@
         Property { name: "rightLabel"; type: "string"; isReadonly: true }
         Property { name: "icons"; type: "QStringList"; isReadonly: true }
         Property { name: "accessibleName"; type: "string"; isReadonly: true }
-        Property { name: "visible"; type: "bool"; isReadonly: true }
+        Property { name: "indicatorVisible"; type: "bool"; isReadonly: true }
         Signal { name: "updated" }
     }
     Component {
@@ -268,25 +261,4 @@
         }
         Method { name: "pop"; type: "UnityMenuModel*" }
     }
-    Component {
-        name: "VisibleIndicatorsModel"
-        prototype: "QIdentityProxyModel"
-        exports: ["Unity.Indicators/VisibleIndicatorsModel 0.1"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
-        Property { name: "visible"; type: "QVariantMap" }
-        Signal { name: "totalCountChanged" }
-        Method {
-            name: "onBeginRowInserted"
-            Parameter { type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Method {
-            name: "onRowInserted"
-            Parameter { type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-    }
 }

=== modified file 'plugins/Unity/Launcher/Launcher.qmltypes'
--- plugins/Unity/Launcher/Launcher.qmltypes	2014-10-07 10:58:39 +0000
+++ plugins/Unity/Launcher/Launcher.qmltypes	2015-02-13 09:02:58 +0000
@@ -25,6 +25,7 @@
             name: "requestRemove"
             Parameter { name: "appId"; type: "string" }
         }
+        Method { name: "refresh" }
         Method {
             name: "get"
             type: "unity::shell::launcher::LauncherItemInterface*"
@@ -136,6 +137,8 @@
             type: "unity::shell::application::ApplicationManagerInterface"
             isPointer: true
         }
+        Property { name: "onlyPinned"; type: "bool" }
+        Signal { name: "hint" }
         Method {
             name: "move"
             Parameter { name: "oldIndex"; type: "int" }

=== modified file 'plugins/Unity/Session/Session.qmltypes'
--- plugins/Unity/Session/Session.qmltypes	2014-10-07 10:58:39 +0000
+++ plugins/Unity/Session/Session.qmltypes	2015-02-13 09:02:58 +0000
@@ -9,7 +9,7 @@
 Module {
     Component {
         name: "DBusUnitySessionService"
-        prototype: "QObject"
+        prototype: "UnityDBusObject"
         exports: ["Unity.Session/DBusUnitySessionService 0.1"]
         isCreatable: false
         isSingleton: true
@@ -33,6 +33,9 @@
         Method { name: "RequestLogout" }
         Method { name: "RequestReboot" }
         Method { name: "RequestShutdown" }
+        Method { name: "logout" }
+        Method { name: "reboot" }
+        Method { name: "shutdown" }
     }
     Component {
         name: "OrientationLock"
@@ -44,4 +47,5 @@
         Property { name: "enabled"; type: "bool"; isReadonly: true }
         Property { name: "savedOrientation"; type: "Qt::ScreenOrientation" }
     }
+    Component { name: "UnityDBusObject"; prototype: "QObject" }
 }

=== modified file 'plugins/Utils/Utils.qmltypes'
--- plugins/Utils/Utils.qmltypes	2014-10-07 10:58:39 +0000
+++ plugins/Utils/Utils.qmltypes	2015-02-13 09:02:58 +0000
@@ -60,53 +60,6 @@
         Method { name: "invalidate" }
     }
     Component {
-        name: "QSortFilterProxyModelQML"
-        prototype: "QSortFilterProxyModel"
-        exports: ["Utils/SortFilterProxyModel 0.1"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
-        Property { name: "totalCount"; type: "int"; isReadonly: true }
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "invertMatch"; type: "bool" }
-        Signal {
-            name: "invertMatchChanged"
-            Parameter { type: "bool" }
-        }
-        Method {
-            name: "get"
-            type: "QVariantMap"
-            Parameter { name: "row"; type: "int" }
-        }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method { name: "count"; type: "int" }
-        Method {
-            name: "findFirst"
-            type: "int"
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method {
-            name: "mapRowToSource"
-            type: "int"
-            Parameter { name: "row"; type: "int" }
-        }
-        Method {
-            name: "mapFromSource"
-            type: "int"
-            Parameter { name: "row"; type: "int" }
-        }
-        Method {
-            name: "mapToSource"
-            type: "int"
-            Parameter { name: "row"; type: "int" }
-        }
-    }
-    Component {
         name: "RelativeTimeFormatter"
         prototype: "TimeFormatter"
         exports: ["Utils/RelativeTimeFormatter 0.1"]
@@ -147,10 +100,76 @@
         Property { name: "menuObjectPathHint"; type: "QByteArray" }
     }
     Component {
+        name: "UnitySortFilterProxyModelQML"
+        prototype: "QSortFilterProxyModel"
+        exports: ["Utils/UnitySortFilterProxyModel 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
+        Property { name: "totalCount"; type: "int"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "invertMatch"; type: "bool" }
+        Signal {
+            name: "invertMatchChanged"
+            Parameter { type: "bool" }
+        }
+        Method {
+            name: "get"
+            type: "QVariantMap"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "data"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "int" }
+        }
+        Method { name: "count"; type: "int" }
+        Method {
+            name: "findFirst"
+            type: "int"
+            Parameter { name: "role"; type: "int" }
+            Parameter { name: "value"; type: "QVariant" }
+        }
+        Method {
+            name: "mapRowToSource"
+            type: "int"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "mapFromSource"
+            type: "int"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "mapToSource"
+            type: "int"
+            Parameter { name: "row"; type: "int" }
+        }
+    }
+    Component {
         name: "WindowKeysFilter"
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["Utils/WindowKeysFilter 0.1"]
         exportMetaObjectRevisions: [0]
     }
+    Component {
+        name: "WindowStateStorage"
+        prototype: "QObject"
+        exports: ["Utils/WindowStateStorage 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "saveGeometry"
+            Parameter { name: "windowId"; type: "string" }
+            Parameter { name: "rect"; type: "QRect" }
+        }
+        Method {
+            name: "getGeometry"
+            type: "QRect"
+            Parameter { name: "windowId"; type: "string" }
+            Parameter { name: "defaultValue"; type: "QRect" }
+        }
+    }
 }

=== modified file 'plugins/Wizard/Wizard.qmltypes'
--- plugins/Wizard/Wizard.qmltypes	2014-11-14 17:47:00 +0000
+++ plugins/Wizard/Wizard.qmltypes	2015-02-13 09:02:58 +0000
@@ -11,8 +11,6 @@
         name: "PageList"
         prototype: "QObject"
         exports: ["Wizard/PageList 0.1"]
-        isCreatable: false
-        isSingleton: true
         exportMetaObjectRevisions: [0]
         Property { name: "index"; type: "int"; isReadonly: true }
         Property { name: "numPages"; type: "int"; isReadonly: true }
@@ -33,4 +31,3 @@
         }
     }
 }
-

=== modified file 'tests/mocks/AccountsService/AccountsService.qmltypes'
--- tests/mocks/AccountsService/AccountsService.qmltypes	2014-10-07 10:58:39 +0000
+++ tests/mocks/AccountsService/AccountsService.qmltypes	2015-02-13 09:02:58 +0000
@@ -29,5 +29,8 @@
         Property { name: "statsWelcomeScreen"; type: "bool" }
         Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
         Property { name: "failedLogins"; type: "uint" }
+        Property { name: "hereEnabled"; type: "bool" }
+        Property { name: "hereLicensePath"; type: "string" }
+        Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
     }
 }

=== modified file 'tests/mocks/LightDM/LightDM.qmltypes'
--- tests/mocks/LightDM/LightDM.qmltypes	2014-10-07 10:58:39 +0000
+++ tests/mocks/LightDM/LightDM.qmltypes	2015-02-13 09:02:58 +0000
@@ -10,10 +10,6 @@
     Component {
         name: "Greeter"
         prototype: "QObject"
-        exports: ["LightDM/Greeter 0.1"]
-        isCreatable: false
-        isSingleton: true
-        exportMetaObjectRevisions: [0]
         Property { name: "active"; type: "bool" }
         Property { name: "authenticated"; type: "bool"; isReadonly: true }
         Property { name: "authenticationUser"; type: "string"; isReadonly: true }
@@ -63,6 +59,32 @@
         }
     }
     Component {
+        name: "MockGreeter"
+        prototype: "Greeter"
+        exports: ["LightDM/Greeter 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "mockMode"; type: "string" }
+        Signal {
+            name: "mockModeChanged"
+            Parameter { name: "mode"; type: "string" }
+        }
+    }
+    Component {
+        name: "MockUsersModel"
+        prototype: "UsersModel"
+        exports: ["LightDM/Users 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "mockMode"; type: "string" }
+        Signal {
+            name: "mockModeChanged"
+            Parameter { name: "mode"; type: "string" }
+        }
+    }
+    Component {
         name: "QAbstractProxyModel"
         prototype: "QAbstractItemModel"
         Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
@@ -86,6 +108,11 @@
                 "BackgroundPathRole": 263
             }
         }
+        Property { name: "mockMode"; type: "string" }
+        Signal {
+            name: "mockModeChanged"
+            Parameter { name: "mode"; type: "string" }
+        }
     }
     Component {
         name: "QSortFilterProxyModel"
@@ -114,7 +141,7 @@
         Method { name: "invalidate" }
     }
     Component {
-        name: "QSortFilterProxyModelQML"
+        name: "UnitySortFilterProxyModelQML"
         prototype: "QSortFilterProxyModel"
         Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
         Property { name: "totalCount"; type: "int"; isReadonly: true }
@@ -240,12 +267,5 @@
         Method { name: "nextDataSourceSlot" }
         Method { name: "readyForDataChangeSlot" }
     }
-    Component {
-        name: "UsersModel"
-        prototype: "QSortFilterProxyModelQML"
-        exports: ["LightDM/Users 0.1"]
-        isCreatable: false
-        isSingleton: true
-        exportMetaObjectRevisions: [0]
-    }
+    Component { name: "UsersModel"; prototype: "UnitySortFilterProxyModelQML" }
 }

=== added file 'tests/mocks/MeeGo/QOfono/QOfono.qmltypes'
--- tests/mocks/MeeGo/QOfono/QOfono.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/MeeGo/QOfono/QOfono.qmltypes	2015-02-13 09:02:58 +0000
@@ -0,0 +1,30 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable MeeGo.QOfono 0.2 tests/mocks'
+
+Module {
+    Component {
+        name: "MockQOfono"
+        prototype: "QObject"
+        exports: ["MeeGo.QOfono/MockQOfono 0.2"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "available"; type: "bool" }
+        Property { name: "modems"; type: "QStringList"; isReadonly: true }
+        Method {
+            name: "setModems"
+            Parameter { name: "modems"; type: "QStringList" }
+            Parameter { name: "present"; type: "QList<bool>" }
+        }
+        Method {
+            name: "isModemPresent"
+            type: "bool"
+            Parameter { name: "modem"; type: "string" }
+        }
+    }
+}

=== modified file 'tests/mocks/QMenuModel/QMenuModel.qmltypes'
--- tests/mocks/QMenuModel/QMenuModel.qmltypes	2014-10-07 10:58:39 +0000
+++ tests/mocks/QMenuModel/QMenuModel.qmltypes	2015-02-13 09:02:58 +0000
@@ -8,12 +8,45 @@
 
 Module {
     Component {
+        name: "ActionData"
+        prototype: "QObject"
+        exports: ["QMenuModel/ActionData 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "data"; type: "QVariant" }
+    }
+    Component {
         name: "ActionStateParser"
         prototype: "QObject"
         exports: ["QMenuModel/ActionStateParser 0.1"]
         exportMetaObjectRevisions: [0]
     }
     Component {
+        name: "DBusEnums"
+        prototype: "QObject"
+        exports: ["QMenuModel/DBus 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "BusType"
+            values: {
+                "None": 0,
+                "SessionBus": 1,
+                "SystemBus": 2,
+                "LastBusType": 3
+            }
+        }
+        Enum {
+            name: "ConnectionStatus"
+            values: {
+                "Disconnected": 0,
+                "Connecting": 1,
+                "Connected": 2
+            }
+        }
+    }
+    Component {
         name: "UnityMenuModel"
         prototype: "QAbstractListModel"
         exports: ["QMenuModel/UnityMenuModel 0.1"]

=== added file 'tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/LanguagePlugin.qmltypes'
--- tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/LanguagePlugin.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/LanguagePlugin.qmltypes	2015-02-13 09:02:58 +0000
@@ -0,0 +1,10 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Ubuntu.SystemSettings.LanguagePlugin 1.0 tests/mocks'
+
+Module {
+}

=== added file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/SecurityPrivacy.qmltypes'
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/SecurityPrivacy.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/SecurityPrivacy.qmltypes	2015-02-13 09:02:58 +0000
@@ -0,0 +1,39 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Ubuntu.SystemSettings.SecurityPrivacy 1.0 tests/mocks'
+
+Module {
+    Component {
+        name: "MockSecurityPrivacy"
+        prototype: "QObject"
+        exports: [
+            "Ubuntu.SystemSettings.SecurityPrivacy/UbuntuSecurityPrivacyPanel 1.0"
+        ]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "SecurityType"
+            values: {
+                "Swipe": 0,
+                "Passcode": 1,
+                "Passphrase": 2
+            }
+        }
+        Signal {
+            name: "setSecurityCalled"
+            Parameter { name: "oldPasswd"; type: "string" }
+            Parameter { name: "newPasswd"; type: "string" }
+            Parameter { name: "newType"; type: "SecurityType" }
+        }
+        Method {
+            name: "setSecurity"
+            type: "string"
+            Parameter { name: "oldPasswd"; type: "string" }
+            Parameter { name: "newPasswd"; type: "string" }
+            Parameter { name: "newType"; type: "SecurityType" }
+        }
+    }
+}

=== modified file 'tests/mocks/Unity/Application/Application.qmltypes'
--- tests/mocks/Unity/Application/Application.qmltypes	2014-10-07 10:58:39 +0000
+++ tests/mocks/Unity/Application/Application.qmltypes	2015-02-13 09:02:58 +0000
@@ -239,6 +239,8 @@
         Property { name: "name"; type: "string"; isReadonly: true }
         Property { name: "live"; type: "bool"; isReadonly: true }
         Property { name: "orientation"; type: "Qt::ScreenOrientation" }
+        Property { name: "touchPressCount"; type: "int" }
+        Property { name: "touchReleaseCount"; type: "int" }
         Signal {
             name: "typeChanged"
             Parameter { type: "Type" }
@@ -251,6 +253,14 @@
             name: "liveChanged"
             Parameter { name: "live"; type: "bool" }
         }
+        Signal {
+            name: "touchPressCountChanged"
+            Parameter { name: "count"; type: "int" }
+        }
+        Signal {
+            name: "touchReleaseCountChanged"
+            Parameter { name: "count"; type: "int" }
+        }
         Signal { name: "inputMethodRequested" }
         Signal { name: "inputMethodDismissed" }
         Signal { name: "deregister" }
@@ -296,6 +306,10 @@
             name: "addChildSession"
             Parameter { name: "session"; type: "Session"; isPointer: true }
         }
+        Method {
+            name: "removeChildSession"
+            Parameter { name: "session"; type: "Session"; isPointer: true }
+        }
     }
     Component {
         name: "SessionManager"
@@ -346,6 +360,34 @@
         Method { name: "inputMethodSurface"; type: "MirSurfaceItem*" }
     }
     Component {
+        name: "UbuntuKeyboardInfo"
+        prototype: "QObject"
+        exports: ["Unity.Application/UbuntuKeyboardInfo 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "x"; type: "double"; isReadonly: true }
+        Property { name: "y"; type: "double"; isReadonly: true }
+        Property { name: "width"; type: "double"; isReadonly: true }
+        Property { name: "height"; type: "double"; isReadonly: true }
+        Signal {
+            name: "xChanged"
+            Parameter { name: "x"; type: "double" }
+        }
+        Signal {
+            name: "yChanged"
+            Parameter { name: "y"; type: "double" }
+        }
+        Signal {
+            name: "widthChanged"
+            Parameter { name: "width"; type: "double" }
+        }
+        Signal {
+            name: "heightChanged"
+            Parameter { name: "height"; type: "double" }
+        }
+    }
+    Component {
         name: "unity::shell::application::ApplicationInfoInterface"
         prototype: "QObject"
         exports: ["Unity.Application/ApplicationInfoInterface 0.1"]

=== modified file 'tests/mocks/Unity/Indicators/Indicators.qmltypes'
--- tests/mocks/Unity/Indicators/Indicators.qmltypes	2014-10-07 10:58:39 +0000
+++ tests/mocks/Unity/Indicators/Indicators.qmltypes	2015-02-13 09:02:58 +0000
@@ -29,6 +29,7 @@
         exports: ["Unity.Indicators/FakeIndicatorsModel 0.1"]
         exportMetaObjectRevisions: [0]
         Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "profile"; type: "string" }
         Property { name: "modelData"; type: "QVariant" }
         Method {
             name: "load"
@@ -64,16 +65,17 @@
         exportMetaObjectRevisions: [0]
         Method {
             name: "setCachedModelData"
-            Parameter { name: "bus"; type: "QByteArray" }
             Parameter { name: "path"; type: "QByteArray" }
-            Parameter { name: "actions"; type: "QVariantMap" }
             Parameter { name: "data"; type: "QVariant" }
         }
         Method {
             name: "setCachedModelData"
-            Parameter { name: "bus"; type: "QByteArray" }
-            Parameter { name: "path"; type: "QByteArray" }
-            Parameter { name: "actions"; type: "QVariantMap" }
+            Parameter { name: "path"; type: "QByteArray" }
+        }
+        Method {
+            name: "getCachedModelData"
+            type: "QVariant"
+            Parameter { name: "path"; type: "QByteArray" }
         }
     }
     Component {
@@ -105,8 +107,7 @@
             values: {
                 "Identifier": 0,
                 "Position": 1,
-                "IndicatorProperties": 2,
-                "IsVisible": 3
+                "IndicatorProperties": 2
             }
         }
     }
@@ -183,12 +184,6 @@
         }
     }
     Component {
-        name: "QAbstractProxyModel"
-        prototype: "QAbstractItemModel"
-        Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
-    }
-    Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
-    Component {
         name: "SharedUnityMenuModel"
         prototype: "QObject"
         exports: ["Unity.Indicators/SharedUnityMenuModel 0.1"]
@@ -234,25 +229,4 @@
         }
         Method { name: "pop"; type: "UnityMenuModel*" }
     }
-    Component {
-        name: "VisibleIndicatorsModel"
-        prototype: "QIdentityProxyModel"
-        exports: ["Unity.Indicators/VisibleIndicatorsModel 0.1"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
-        Property { name: "visible"; type: "QVariantMap" }
-        Signal { name: "totalCountChanged" }
-        Method {
-            name: "onBeginRowInserted"
-            Parameter { type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Method {
-            name: "onRowInserted"
-            Parameter { type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-    }
 }

=== modified file 'tests/mocks/Unity/Launcher/Launcher.qmltypes'
--- tests/mocks/Unity/Launcher/Launcher.qmltypes	2014-10-07 10:58:39 +0000
+++ tests/mocks/Unity/Launcher/Launcher.qmltypes	2015-02-13 09:02:58 +0000
@@ -63,6 +63,7 @@
             type: "string"
             Parameter { name: "appId"; type: "string" }
         }
+        Method { name: "emitHint" }
     }
     Component {
         name: "MockQuickListModel"
@@ -141,6 +142,8 @@
             type: "unity::shell::application::ApplicationManagerInterface"
             isPointer: true
         }
+        Property { name: "onlyPinned"; type: "bool" }
+        Signal { name: "hint" }
         Method {
             name: "move"
             Parameter { name: "oldIndex"; type: "int" }

=== modified file 'tests/mocks/Unity/Notifications/Notifications.qmltypes'
--- tests/mocks/Unity/Notifications/Notifications.qmltypes	2014-06-26 07:47:57 +0000
+++ tests/mocks/Unity/Notifications/Notifications.qmltypes	2015-02-13 09:02:58 +0000
@@ -7,4 +7,143 @@
 // 'qmlplugindump -notrelocatable Unity.Notifications 1.0 tests/mocks'
 
 Module {
+    Component {
+        name: "ActionModel"
+        prototype: "QStringListModel"
+        exports: ["Unity.Notifications/ActionModel 1.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "ActionsRoles"
+            values: {
+                "RoleActionLabel": 257,
+                "RoleActionId": 258
+            }
+        }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Method {
+            name: "data"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "int" }
+        }
+        Method {
+            name: "append"
+            Parameter { name: "id"; type: "string" }
+            Parameter { name: "label"; type: "string" }
+        }
+    }
+    Component {
+        name: "MockNotification"
+        prototype: "QObject"
+        exports: ["Unity.Notifications/Notification 1.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Type"
+            values: {
+                "PlaceHolder": 0,
+                "Confirmation": 1,
+                "Ephemeral": 2,
+                "Interactive": 3,
+                "SnapDecision": 4
+            }
+        }
+        Property { name: "summary"; type: "string" }
+        Property { name: "body"; type: "string" }
+        Property { name: "nid"; type: "int" }
+        Property { name: "value"; type: "int" }
+        Property { name: "icon"; type: "string" }
+        Property { name: "secondaryIcon"; type: "string" }
+        Property { name: "type"; type: "Type" }
+        Property { name: "rawActions"; type: "QStringList" }
+        Property { name: "actions"; type: "ActionModel"; isReadonly: true; isPointer: true }
+        Property { name: "hints"; type: "QVariantMap" }
+        Signal {
+            name: "summaryChanged"
+            Parameter { name: "summary"; type: "string" }
+        }
+        Signal {
+            name: "bodyChanged"
+            Parameter { name: "body"; type: "string" }
+        }
+        Signal {
+            name: "idChanged"
+            Parameter { name: "id"; type: "int" }
+        }
+        Signal {
+            name: "valueChanged"
+            Parameter { name: "value"; type: "int" }
+        }
+        Signal {
+            name: "iconChanged"
+            Parameter { name: "icon"; type: "string" }
+        }
+        Signal {
+            name: "secondaryIconChanged"
+            Parameter { name: "secondaryIcon"; type: "string" }
+        }
+        Signal {
+            name: "typeChanged"
+            Parameter { name: "type"; type: "Type" }
+        }
+        Signal {
+            name: "actionsChanged"
+            Parameter { name: "actions"; type: "QStringList" }
+        }
+        Signal {
+            name: "hintsChanged"
+            Parameter { name: "hints"; type: "QVariantMap" }
+        }
+        Signal {
+            name: "dataChanged"
+            Parameter { name: "nid"; type: "int" }
+        }
+        Signal {
+            name: "completed"
+            Parameter { name: "nid"; type: "int" }
+        }
+        Signal {
+            name: "actionInvoked"
+            Parameter { name: "action"; type: "string" }
+        }
+        Method {
+            name: "invokeAction"
+            Parameter { name: "action"; type: "string" }
+        }
+        Method { name: "close" }
+    }
+    Component {
+        name: "MockNotificationModel"
+        prototype: "QAbstractListModel"
+        exports: ["Unity.Notifications/NotificationModel 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal {
+            name: "actionInvoked"
+            Parameter { name: "action"; type: "string" }
+        }
+        Signal {
+            name: "queueSizeChanged"
+            Parameter { name: "newSize"; type: "int" }
+        }
+        Method {
+            name: "onCompleted"
+            Parameter { name: "id"; type: "int" }
+        }
+        Method {
+            name: "append"
+            Parameter { name: "n"; type: "MockNotification"; isPointer: true }
+        }
+        Method {
+            name: "getRaw"
+            type: "MockNotification*"
+            Parameter { name: "notificationId"; type: "int" }
+        }
+        Method { name: "queued"; type: "int" }
+        Method {
+            name: "remove"
+            Parameter { name: "id"; type: "int" }
+        }
+        Method { name: "removeSecond" }
+    }
+    Component { name: "QStringListModel"; prototype: "QAbstractListModel" }
 }

=== modified file 'tests/mocks/Unity/Unity.qmltypes'
--- tests/mocks/Unity/Unity.qmltypes	2014-10-07 10:58:39 +0000
+++ tests/mocks/Unity/Unity.qmltypes	2015-02-13 09:02:58 +0000
@@ -169,8 +169,19 @@
             Parameter { name: "scope"; type: "Scope"; isPointer: true }
         }
         Method { name: "clear" }
+        Method { name: "clearFavorites" }
         Method { name: "load" }
         Method {
+            name: "setFavorite"
+            Parameter { name: "scopeId"; type: "string" }
+            Parameter { name: "favorite"; type: "bool" }
+        }
+        Method {
+            name: "moveFavoriteTo"
+            Parameter { name: "scopeId"; type: "string" }
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
             name: "getScopeFromAll"
             type: "Scope*"
             Parameter { name: "scope_id"; type: "string" }
@@ -443,6 +454,16 @@
             type: "unity::shell::scopes::ScopeInterface*"
             Parameter { name: "scopeId"; type: "string" }
         }
+        Method {
+            name: "setFavorite"
+            Parameter { name: "scopeId"; type: "string" }
+            Parameter { name: "favorite"; type: "bool" }
+        }
+        Method {
+            name: "moveFavoriteTo"
+            Parameter { name: "scopeId"; type: "string" }
+            Parameter { name: "index"; type: "int" }
+        }
     }
     Component {
         name: "unity::shell::scopes::SettingsModelInterface"

=== modified file 'tests/mocks/Wizard/Wizard.qmltypes'
--- tests/mocks/Wizard/Wizard.qmltypes	2014-11-14 17:47:00 +0000
+++ tests/mocks/Wizard/Wizard.qmltypes	2015-02-13 09:02:58 +0000
@@ -15,6 +15,10 @@
         isSingleton: true
         exportMetaObjectRevisions: [0]
         Property { name: "wizardEnabled"; type: "bool" }
+        Signal {
+            name: "updateSessionLanguageCalled"
+            Parameter { name: "locale"; type: "string" }
+        }
         Method {
             name: "updateSessionLanguage"
             Parameter { name: "locale"; type: "string" }
@@ -24,8 +28,6 @@
         name: "PageList"
         prototype: "QObject"
         exports: ["Wizard/PageList 0.1"]
-        isCreatable: false
-        isSingleton: true
         exportMetaObjectRevisions: [0]
         Property { name: "index"; type: "int"; isReadonly: true }
         Property { name: "numPages"; type: "int"; isReadonly: true }
@@ -33,4 +35,3 @@
         Method { name: "next"; type: "string" }
     }
 }
-

=== modified file 'tests/utils/modules/Unity/Test/Test.qmltypes'
--- tests/utils/modules/Unity/Test/Test.qmltypes	2014-06-26 07:47:57 +0000
+++ tests/utils/modules/Unity/Test/Test.qmltypes	2015-02-13 09:02:58 +0000
@@ -21,6 +21,7 @@
             Parameter { type: "string" }
         }
         Method { name: "touchEvent"; type: "TouchEventSequenceWrapper*" }
+        Method { name: "ensureTouchRegistryInstalled" }
     }
     Component {
         name: "TouchEventSequenceWrapper"