Merge lp:~unity-team/unity8/manual-qmltypes into lp:unity8

[Michał Sawicz]

Only generate .qmltypes files manually, no need to do it build-time.

It didn't work when cross-compiling either, and required builders to have otherwise unnecessary environment.

[Michał Sawicz (saviq)]

We'll need to check those .qmltypes files into bzr, and copy/install them along with qmldir, so there's a bit more work involved here.

They should be generated into the source dirs, not binary.

I'll take this over tomorrow morning if you have no objections :).

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:985
http://jenkins.qa.ubuntu.com/job/unity8-ci/3223/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1218/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/227/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2098/console

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

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

On Wed, 2014-06-25 at 22:22 +0000, Michał Sawicz wrote:
> Review: Needs Fixing
>
> We'll need to check those .qmltypes files into bzr, and copy/install them along with qmldir, so there's a bit more work involved here.
>
> They should be generated into the source dirs, not binary.
>
> I'll take this over tomorrow morning if you have no objections :).

Done. :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:986
http://jenkins.qa.ubuntu.com/job/unity8-ci/3224/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1224/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/228/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/318/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/318/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/318/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2105/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/manual-qmltypes]

988. By Michał Sawicz on 2014-06-26

Do not generate qmltypes for the duplicate plugin.

989. By Michał Sawicz on 2014-06-26

Merge move-indicator-qml.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:987
http://jenkins.qa.ubuntu.com/job/unity8-ci/3226/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/230/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2113/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:987
http://jenkins.qa.ubuntu.com/job/unity8-ci/3229/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1235
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/323
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/323/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1563
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2118
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8881

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/manual-qmltypes]

990. By Michał Sawicz on 2014-06-27

Merge trunk.

991. By Michał Sawicz on 2014-07-08

Merge trunk.

992. By Michał Sawicz on 2014-07-08

Update qmltypes.

993. By Michał Sawicz on 2014-07-10

Merge trunk

994. By Michał Sawicz on 2014-07-10

Update qmltypes.

Unmerged revisions

=== modified file 'cmake/modules/QmlPlugins.cmake'
--- cmake/modules/QmlPlugins.cmake	2014-05-15 14:56:56 +0000
+++ cmake/modules/QmlPlugins.cmake	2014-06-26 10:07:27 +0000
@@ -12,6 +12,12 @@
     set_target_properties(qmlplugindump PROPERTIES IMPORTED_LOCATION ${qmlplugindump_exe})
 endif()
 
+#
+# A custom target for building the qmltypes files manually.
+#
+if (NOT TARGET qmltypes)
+    add_custom_target(qmltypes)
+endif()
 
 # Creates a target for copying resource files into build dir and optionally installing them.
 #
@@ -51,6 +57,7 @@
         ${QMLFILES_SEARCH_PATH}/*.png
         ${QMLFILES_SEARCH_PATH}/*.sci
         ${QMLFILES_SEARCH_PATH}/*.svg
+        ${QMLFILES_SEARCH_PATH}/*.qmltypes
         ${QMLFILES_SEARCH_PATH}/qmldir
     )
 
@@ -69,14 +76,14 @@
             DESTINATION ${QMLFILES_DESTINATION}/${PATH}
         )
     endif()
-endmacro(export_qmlfiles)
-
-
-# Creates a target for generating the typeinfo file for a QML plugin and optionally installs it
-# and additional targets.
+endmacro()
+
+
+# Creates a target for generating the typeinfo file for a QML plugin and/or installs the plugin
+# targets.
 #
 # Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
-# into ${DESTINATION}/${path}. If you don't pass BINARY_DIR, it's  assumed that current source
+# into ${DESTINATION}/${path}. If you don't pass BINARY_DIR, it's assumed that current source
 # path ends with ${path}.
 #
 # The generated file will be named after the last segment of the plugin name, e.g. Foo.qmltypes.
@@ -87,15 +94,18 @@
 #     [TARGET_PREFIX string]  # Will be prefixed to the target name
 #     [ENVIRONMENT string]    # Will be added to qmlplugindump's env
 #     [TARGETS target1 [target2 ...]] # Targets to depend on and install (e.g. the plugin shared object)
+#     [NO_TYPES] # Do not create the qmltypes target
 # )
 #
 # Created target:
-#   - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the binary dir.
+#   - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the source dir.
+#     It will be made a dependency of the "qmltypes" target.
 
 macro(export_qmlplugin PLUGIN VERSION PATH)
+    set(options NO_TYPES)
     set(single BINARY_DIR DESTINATION TARGET_PREFIX ENVIRONMENT)
     set(multi TARGETS)
-    cmake_parse_arguments(QMLPLUGIN "" "${single}" "${multi}" ${ARGN})
+    cmake_parse_arguments(QMLPLUGIN "${options}" "${single}" "${multi}" ${ARGN})
 
     get_target_property(qmlplugindump_executable qmlplugindump LOCATION)
 
@@ -103,29 +113,26 @@
         set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
     else()
         # Find import path to point qmlplugindump at
-        string(REGEX REPLACE "${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+        string(REGEX REPLACE "/${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
         set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})
     endif()
 
-    # Find the last segment of the plugin name to use as qmltypes basename
-    string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
-    set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
-    set(qmltypes_path ${qmlplugin_dir}/${plugin_suffix}.qmltypes)
-
-    # Only generate typeinfo if not cross compiling
-    if(NOT CMAKE_CROSSCOMPILING)
-        add_custom_target(${target_prefix}-qmltypes ALL
+    if(NOT QMLPLUGIN_NO_TYPES)
+        # Relative path for the module
+        string(REPLACE "${CMAKE_BINARY_DIR}/" "" QMLPLUGIN_MODULE_DIR "${QMLPLUGIN_BINARY_DIR}")
+
+        # Find the last segment of the plugin name to use as qmltypes basename
+        string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
+        set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
+        set(qmltypes_path ${CMAKE_CURRENT_SOURCE_DIR}/${plugin_suffix}.qmltypes)
+
+        add_custom_target(${target_prefix}-qmltypes
             COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
-                    ${PLUGIN} ${VERSION} ${QMLPLUGIN_BINARY_DIR} > ${qmltypes_path}
+                    ${PLUGIN} ${VERSION} ${QMLPLUGIN_MODULE_DIR} > ${qmltypes_path}
+                    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         )
         add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
-
-        if (QMLPLUGIN_DESTINATION)
-            # Install the typeinfo file
-            install(FILES ${qmltypes_path}
-                    DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
-            )
-        endif()
+        add_dependencies(qmltypes ${target_prefix}-qmltypes)
     endif()
 
     set_target_properties(${QMLPLUGIN_TARGETS} PROPERTIES

=== added file 'plugins/AccountsService/AccountsService.qmltypes'
--- plugins/AccountsService/AccountsService.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/AccountsService/AccountsService.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,22 @@
+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 AccountsService 0.1 plugins'
+
+Module {
+    Component {
+        name: "AccountsService"
+        prototype: "QObject"
+        exports: ["AccountsService/AccountsService 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "user"; type: "string" }
+        Property { name: "demoEdges"; type: "bool" }
+        Property { name: "backgroundFile"; type: "string"; isReadonly: true }
+        Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
+    }
+}

=== added file 'plugins/Dash/Dash.qmltypes'
--- plugins/Dash/Dash.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Dash/Dash.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,95 @@
+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 Dash 0.1 plugins'
+
+Module {
+    Component {
+        name: "AbstractDashView"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "columnSpacing"; type: "double" }
+        Property { name: "rowSpacing"; type: "double" }
+        Property { name: "displayMarginBeginning"; type: "double" }
+        Property { name: "displayMarginEnd"; type: "double" }
+    }
+    Component {
+        name: "HorizontalJournal"
+        defaultProperty: "data"
+        prototype: "AbstractDashView"
+        exports: ["Dash/HorizontalJournal 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "rowHeight"; type: "double" }
+    }
+    Component {
+        name: "ListViewWithPageHeader"
+        defaultProperty: "flickableData"
+        prototype: "QQuickFlickable"
+        exports: ["Dash/ListViewWithPageHeader 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "pageHeader"; type: "QQuickItem"; isPointer: true }
+        Property { name: "sectionDelegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "sectionProperty"; type: "string" }
+        Property { name: "forceNoClip"; type: "bool" }
+        Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }
+        Signal { name: "headerChanged" }
+        Method { name: "positionAtBeginning" }
+        Method { name: "showHeader" }
+        Method {
+            name: "item"
+            type: "QQuickItem*"
+            Parameter { name: "modelIndex"; type: "int" }
+        }
+        Method {
+            name: "maximizeVisibleArea"
+            type: "bool"
+            Parameter { name: "modelIndex"; type: "int" }
+        }
+        Method {
+            name: "maximizeVisibleArea"
+            type: "bool"
+            Parameter { name: "modelIndex"; type: "int" }
+            Parameter { name: "itemHeight"; type: "int" }
+        }
+    }
+    Component {
+        name: "OrganicGrid"
+        defaultProperty: "data"
+        prototype: "AbstractDashView"
+        exports: ["Dash/OrganicGrid 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "smallDelegateSize"; type: "QSizeF" }
+        Property { name: "bigDelegateSize"; type: "QSizeF" }
+    }
+    Component {
+        name: "VerticalJournal"
+        defaultProperty: "data"
+        prototype: "AbstractDashView"
+        exports: ["Dash/VerticalJournal 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "columnWidth"; type: "double" }
+    }
+    Component {
+        prototype: "QObject"
+        name: "CardCreatorCache"
+        exports: ["CardCreatorCache -1.-1"]
+        exportMetaObjectRevisions: [-1]
+        isComposite: true
+        isCreatable: false
+        isSingleton: true
+        Property { name: "cache"; type: "QVariant" }
+        Method {
+            name: "getCardComponent"
+            type: "QVariant"
+            Parameter { name: "template"; type: "QVariant" }
+            Parameter { name: "components"; type: "QVariant" }
+        }
+    }
+}

=== added file 'plugins/HudClient/HudClient.qmltypes'
--- plugins/HudClient/HudClient.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/HudClient/HudClient.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,91 @@
+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 HudClient 0.1 plugins'
+
+Module {
+    Component {
+        name: "DeeListModel"
+        prototype: "QAbstractListModel"
+        Property { name: "name"; type: "string" }
+        Property { name: "synchronized"; type: "bool"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal {
+            name: "nameChanged"
+            Parameter { type: "string" }
+        }
+        Signal {
+            name: "synchronizedChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "roleNamesChanged"
+            Parameter { type: "QHash<int,QByteArray>" }
+        }
+        Method {
+            name: "get"
+            type: "QVariantMap"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method { name: "count"; type: "int" }
+    }
+    Component {
+        name: "HudClient"
+        prototype: "QObject"
+        exports: ["HudClient/HudClient 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "results"; type: "DeeListModel"; isReadonly: true; isPointer: true }
+        Property { name: "toolBarModel"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
+        Signal { name: "voiceQueryLoading" }
+        Signal { name: "voiceQueryListening" }
+        Signal { name: "voiceQueryHeardSomething" }
+        Signal { name: "voiceQueryFailed" }
+        Signal {
+            name: "voiceQueryFinished"
+            Parameter { name: "query"; type: "string" }
+        }
+        Signal { name: "commandExecuted" }
+        Signal {
+            name: "showParametrizedAction"
+            Parameter { name: "action"; type: "string" }
+            Parameter { name: "items"; type: "QVariant" }
+        }
+        Method {
+            name: "executeCommand"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "setQuery"
+            Parameter { name: "new_query"; type: "string" }
+        }
+        Method { name: "startVoiceQuery" }
+        Method {
+            name: "executeParametrizedAction"
+            Parameter { name: "values"; type: "QVariant" }
+        }
+        Method {
+            name: "updateParametrizedAction"
+            Parameter { name: "values"; type: "QVariant" }
+        }
+        Method { name: "cancelParametrizedAction" }
+        Method {
+            name: "executeToolBarAction"
+            Parameter { name: "action"; type: "HudClientQueryToolbarItems" }
+        }
+    }
+    Component {
+        name: "VolumePeakDetector"
+        prototype: "QObject"
+        exports: ["HudClient/VolumePeakDetector 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "enabled"; type: "bool" }
+        Property { name: "desiredInterval"; type: "int" }
+        Signal {
+            name: "newPeak"
+            Parameter { name: "volume"; type: "float" }
+        }
+    }
+}

=== added file 'plugins/LightDM/LightDM.qmltypes'
--- plugins/LightDM/LightDM.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/LightDM.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,241 @@
+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 LightDM 0.1 plugins'
+
+Module {
+    Component {
+        name: "Greeter"
+        prototype: "QObject"
+        exports: ["LightDM/Greeter 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "authenticated"; type: "bool"; isReadonly: true }
+        Property { name: "authenticationUser"; type: "string"; isReadonly: true }
+        Property { name: "promptless"; type: "bool"; isReadonly: true }
+        Signal {
+            name: "showMessage"
+            Parameter { name: "text"; type: "string" }
+            Parameter { name: "isError"; type: "bool" }
+        }
+        Signal {
+            name: "showPrompt"
+            Parameter { name: "text"; type: "string" }
+            Parameter { name: "isSecret"; type: "bool" }
+        }
+        Signal { name: "authenticationComplete" }
+        Signal {
+            name: "authenticationUserChanged"
+            Parameter { name: "user"; type: "string" }
+        }
+        Signal {
+            name: "requestAuthenticationUser"
+            Parameter { name: "user"; type: "string" }
+        }
+        Method {
+            name: "authenticate"
+            Parameter { name: "username"; type: "string" }
+        }
+        Method { name: "authenticate" }
+        Method {
+            name: "respond"
+            Parameter { name: "response"; type: "string" }
+        }
+        Method {
+            name: "startSessionSync"
+            type: "bool"
+            Parameter { name: "session"; type: "string" }
+        }
+        Method { name: "startSessionSync"; type: "bool" }
+    }
+    Component {
+        name: "QAbstractProxyModel"
+        prototype: "QAbstractItemModel"
+        Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
+    }
+    Component {
+        name: "QLightDM::UsersModel"
+        prototype: "QAbstractListModel"
+        exports: ["LightDM/UserRoles 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "UserModelRoles"
+            values: {
+                "NameRole": 256,
+                "RealNameRole": 257,
+                "LoggedInRole": 258,
+                "BackgroundRole": 259,
+                "SessionRole": 260,
+                "HasMessagesRole": 261,
+                "ImagePathRole": 262,
+                "BackgroundPathRole": 263
+            }
+        }
+    }
+    Component {
+        name: "QSortFilterProxyModel"
+        prototype: "QAbstractProxyModel"
+        Property { name: "filterRegExp"; type: "QRegExp" }
+        Property { name: "filterKeyColumn"; type: "int" }
+        Property { name: "dynamicSortFilter"; type: "bool" }
+        Property { name: "filterCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "sortCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "isSortLocaleAware"; type: "bool" }
+        Property { name: "sortRole"; type: "int" }
+        Property { name: "filterRole"; type: "int" }
+        Method {
+            name: "setFilterRegExp"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterWildcard"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterFixedString"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method { name: "clear" }
+        Method { name: "invalidate" }
+    }
+    Component {
+        name: "QSortFilterProxyModelQML"
+        prototype: "QSortFilterProxyModel"
+        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: "UserMetricsOutput::ColorTheme"
+        prototype: "QObject"
+        Property { name: "start"; type: "QColor"; isReadonly: true }
+        Property { name: "main"; type: "QColor"; isReadonly: true }
+        Property { name: "end"; type: "QColor"; isReadonly: true }
+        Signal {
+            name: "startChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "mainChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "endChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+    }
+    Component {
+        name: "UserMetricsOutput::UserMetrics"
+        prototype: "QObject"
+        exports: ["LightDM/Infographic 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "label"; type: "string"; isReadonly: true }
+        Property { name: "username"; type: "string" }
+        Property {
+            name: "firstColor"
+            type: "UserMetricsOutput::ColorTheme"
+            isReadonly: true
+            isPointer: true
+        }
+        Property {
+            name: "secondColor"
+            type: "UserMetricsOutput::ColorTheme"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "firstMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
+        Property { name: "secondMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
+        Property { name: "currentDay"; type: "int"; isReadonly: true }
+        Signal {
+            name: "labelChanged"
+            Parameter { name: "label"; type: "string" }
+        }
+        Signal {
+            name: "usernameChanged"
+            Parameter { name: "username"; type: "string" }
+        }
+        Signal {
+            name: "firstColorChanged"
+            Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
+        }
+        Signal {
+            name: "firstMonthChanged"
+            Parameter { name: "firstMonth"; type: "QAbstractItemModel"; isPointer: true }
+        }
+        Signal {
+            name: "currentDayChanged"
+            Parameter { name: "currentDay"; type: "int" }
+        }
+        Signal {
+            name: "secondColorChanged"
+            Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
+        }
+        Signal {
+            name: "secondMonthChanged"
+            Parameter { name: "secondMonth"; type: "QAbstractItemModel"; isPointer: true }
+        }
+        Signal { name: "nextDataSource" }
+        Signal { name: "readyForDataChange" }
+        Signal { name: "dataAboutToAppear" }
+        Signal { name: "dataAppeared" }
+        Signal { name: "dataAboutToChange" }
+        Signal { name: "dataChanged" }
+        Signal { name: "dataAboutToDisappear" }
+        Signal { name: "dataDisappeared" }
+        Method { name: "nextDataSourceSlot" }
+        Method { name: "readyForDataChangeSlot" }
+    }
+    Component {
+        name: "UsersModel"
+        prototype: "QSortFilterProxyModelQML"
+        exports: ["LightDM/Users 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+    }
+}

=== added file 'plugins/Powerd/Powerd.qmltypes'
--- plugins/Powerd/Powerd.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Powerd/Powerd.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,46 @@
+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 Powerd 0.1 plugins'
+
+Module {
+    Component {
+        name: "Powerd"
+        prototype: "QObject"
+        exports: ["Powerd/Powerd 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "DisplayFlag"
+            values: {
+                "UseProximity": 1,
+                "DisableAutoBrightness": 2,
+                "Bright": 4
+            }
+        }
+        Enum {
+            name: "DisplayFlags"
+            values: {
+                "UseProximity": 1,
+                "DisableAutoBrightness": 2,
+                "Bright": 4
+            }
+        }
+        Enum {
+            name: "Status"
+            values: {
+                "Off": 0,
+                "On": 1
+            }
+        }
+        Signal {
+            name: "displayPowerStateChange"
+            Parameter { name: "status"; type: "int" }
+            Parameter { name: "flags"; type: "uint" }
+        }
+    }
+}

=== added file 'plugins/SessionBroadcast/SessionBroadcast.qmltypes'
--- plugins/SessionBroadcast/SessionBroadcast.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/SessionBroadcast/SessionBroadcast.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,19 @@
+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 SessionBroadcast 0.1 plugins'
+
+Module {
+    Component {
+        name: "SessionBroadcast"
+        prototype: "QObject"
+        exports: ["SessionBroadcast/SessionBroadcast 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Signal { name: "showHome" }
+    }
+}

=== added file 'plugins/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypes'
--- plugins/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,60 @@
+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.DownloadDaemonListener 0.1 plugins'
+
+Module {
+    Component {
+        name: "DownloadTracker"
+        prototype: "QObject"
+        exports: ["Ubuntu.DownloadDaemonListener/DownloadTracker 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "service"; type: "string" }
+        Property { name: "dbusPath"; type: "string" }
+        Property { name: "serviceReady"; type: "bool"; isReadonly: true }
+        Signal {
+            name: "serviceChanged"
+            Parameter { name: "service"; type: "string" }
+        }
+        Signal {
+            name: "dbusPathChanged"
+            Parameter { name: "dbusPath"; type: "string" }
+        }
+        Signal {
+            name: "serviceReadyChanged"
+            Parameter { name: "serviceReady"; type: "bool" }
+        }
+        Signal {
+            name: "canceled"
+            Parameter { name: "success"; type: "bool" }
+        }
+        Signal {
+            name: "error"
+            Parameter { name: "error"; type: "string" }
+        }
+        Signal {
+            name: "finished"
+            Parameter { name: "path"; type: "string" }
+        }
+        Signal {
+            name: "paused"
+            Parameter { name: "success"; type: "bool" }
+        }
+        Signal {
+            name: "progress"
+            Parameter { name: "received"; type: "qulonglong" }
+            Parameter { name: "total"; type: "qulonglong" }
+        }
+        Signal {
+            name: "resumed"
+            Parameter { name: "success"; type: "bool" }
+        }
+        Signal {
+            name: "started"
+            Parameter { name: "success"; type: "bool" }
+        }
+    }
+}

=== added file 'plugins/Ubuntu/Gestures/Gestures.qmltypes'
--- plugins/Ubuntu/Gestures/Gestures.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/Gestures.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,153 @@
+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.Gestures 0.1 plugins'
+
+Module {
+    Component {
+        name: "AxisVelocityCalculator"
+        prototype: "QObject"
+        exports: ["Ubuntu.Gestures/AxisVelocityCalculator 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "trackedPosition"; type: "double" }
+        Signal {
+            name: "trackedPositionChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Method { name: "calculate"; type: "double" }
+        Method { name: "reset" }
+    }
+    Component {
+        name: "Direction"
+        prototype: "QObject"
+        exports: ["Ubuntu.Gestures/Direction 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Type"
+            values: {
+                "Rightwards": 0,
+                "Leftwards": 1,
+                "Downwards": 2,
+                "Upwards": 3
+            }
+        }
+        Method {
+            name: "isHorizontal"
+            type: "bool"
+            Parameter { name: "type"; type: "Direction::Type" }
+        }
+        Method {
+            name: "isVertical"
+            type: "bool"
+            Parameter { name: "type"; type: "Direction::Type" }
+        }
+        Method {
+            name: "isPositive"
+            type: "bool"
+            Parameter { name: "type"; type: "Direction::Type" }
+        }
+    }
+    Component {
+        name: "DirectionalDragArea"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        exports: ["Ubuntu.Gestures/DirectionalDragArea 0.1"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Status"
+            values: {
+                "WaitingForTouch": 0,
+                "Undecided": 1,
+                "Recognized": 2
+            }
+        }
+        Property { name: "direction"; type: "Direction::Type" }
+        Property { name: "distance"; type: "double"; isReadonly: true }
+        Property { name: "sceneDistance"; type: "double"; isReadonly: true }
+        Property { name: "touchX"; type: "double"; isReadonly: true }
+        Property { name: "touchY"; type: "double"; isReadonly: true }
+        Property { name: "touchSceneX"; type: "double"; isReadonly: true }
+        Property { name: "touchSceneY"; type: "double"; isReadonly: true }
+        Property { name: "status"; type: "Status"; isReadonly: true }
+        Property { name: "dragging"; type: "bool"; isReadonly: true }
+        Property { name: "maxDeviation"; type: "double" }
+        Property { name: "wideningAngle"; type: "double" }
+        Property { name: "distanceThreshold"; type: "double" }
+        Property { name: "minSpeed"; type: "double" }
+        Property { name: "maxSilenceTime"; type: "int" }
+        Property { name: "compositionTime"; type: "int" }
+        Signal {
+            name: "directionChanged"
+            Parameter { name: "direction"; type: "Direction::Type" }
+        }
+        Signal {
+            name: "statusChanged"
+            Parameter { name: "value"; type: "Status" }
+        }
+        Signal {
+            name: "draggingChanged"
+            Parameter { name: "value"; type: "bool" }
+        }
+        Signal {
+            name: "distanceChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Signal {
+            name: "sceneDistanceChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Signal {
+            name: "maxDeviationChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Signal {
+            name: "wideningAngleChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Signal {
+            name: "distanceThresholdChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Signal {
+            name: "minSpeedChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Signal {
+            name: "maxSilenceTimeChanged"
+            Parameter { name: "value"; type: "int" }
+        }
+        Signal {
+            name: "compositionTimeChanged"
+            Parameter { name: "value"; type: "int" }
+        }
+        Signal {
+            name: "touchXChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Signal {
+            name: "touchYChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Signal {
+            name: "touchSceneXChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+        Signal {
+            name: "touchSceneYChanged"
+            Parameter { name: "value"; type: "double" }
+        }
+    }
+    Component {
+        name: "PressedOutsideNotifier"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        exports: ["Ubuntu.Gestures/PressedOutsideNotifier 0.1"]
+        exportMetaObjectRevisions: [0]
+        Signal { name: "pressedOutside" }
+    }
+}

=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
--- plugins/Unity/Indicators/CMakeLists.txt	2014-05-02 22:57:00 +0000
+++ plugins/Unity/Indicators/CMakeLists.txt	2014-06-26 10:07:27 +0000
@@ -51,7 +51,4 @@
 
 qt5_use_modules(IndicatorsQml Core Qml Quick)
 
-add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators
-    SEARCH_PATH qml
-    TARGETS IndicatorsQml
-)
+add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)

=== renamed file 'plugins/Unity/Indicators/qml/CachedUnityMenuModel.qml' => 'plugins/Unity/Indicators/CachedUnityMenuModel.qml'
=== added file 'plugins/Unity/Indicators/Indicators.qmltypes'
--- plugins/Unity/Indicators/Indicators.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Indicators.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,278 @@
+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 Unity.Indicators 0.1 plugins'
+
+Module {
+    Component {
+        name: "ActionState"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/ActionState 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "ActionStates"
+            values: {
+                "Label": 0,
+                "IconSource": 1,
+                "AccessableName": 2,
+                "Visible": 3
+            }
+        }
+    }
+    Component { name: "ActionStateParser"; prototype: "QObject" }
+    Component {
+        name: "FlatMenuProxyModelRole"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/FlatMenuProxyModelRole 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Roles"
+            values: {
+                "Action": 1,
+                "Label": 2,
+                "Extra": 3,
+                "Depth": 4,
+                "hasSection": 5,
+                "hasSubMenu": 6
+            }
+        }
+    }
+    Component {
+        name: "IndicatorsManager"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/IndicatorsManager 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "loaded"; type: "bool"; isReadonly: true }
+        Signal {
+            name: "loadedChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "indicatorLoaded"
+            Parameter { name: "indicator_name"; type: "string" }
+        }
+        Signal {
+            name: "indicatorAboutToBeUnloaded"
+            Parameter { name: "indicator_name"; type: "string" }
+        }
+        Method {
+            name: "load"
+            Parameter { name: "profile"; type: "string" }
+        }
+        Method { name: "unload" }
+    }
+    Component {
+        name: "IndicatorsModel"
+        prototype: "QAbstractListModel"
+        exports: ["Unity.Indicators/IndicatorsModel 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal {
+            name: "indicatorDataChanged"
+            Parameter { name: "data"; type: "QVariant" }
+        }
+        Method {
+            name: "load"
+            Parameter { name: "profile"; type: "string" }
+        }
+        Method { name: "unload" }
+        Method {
+            name: "data"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "int" }
+        }
+    }
+    Component {
+        name: "IndicatorsModelRole"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/IndicatorsModelRole 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Roles"
+            values: {
+                "Identifier": 0,
+                "Position": 1,
+                "WidgetSource": 2,
+                "PageSource": 3,
+                "IndicatorProperties": 4,
+                "IsVisible": 5
+            }
+        }
+    }
+    Component {
+        name: "MenuContentActivator"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/MenuContentActivator 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "baseIndex"; type: "int" }
+        Property { name: "running"; type: "bool" }
+        Property { name: "count"; type: "int" }
+        Property { name: "content"; type: "MenuContentState"; isList: true; isReadonly: true }
+        Signal {
+            name: "baseIndexChanged"
+            Parameter { name: "baseIndex"; type: "int" }
+        }
+        Signal {
+            name: "deltaChanged"
+            Parameter { name: "delta"; type: "int" }
+        }
+        Signal {
+            name: "runningChanged"
+            Parameter { name: "running"; type: "bool" }
+        }
+        Signal {
+            name: "countChanged"
+            Parameter { name: "count"; type: "int" }
+        }
+        Method { name: "restart" }
+        Method { name: "stop" }
+        Method { name: "clear" }
+        Method {
+            name: "isMenuContentActive"
+            type: "bool"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
+        name: "MenuContentState"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/MenuContentState 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "active"; type: "bool"; isReadonly: true }
+    }
+    Component {
+        name: "ModelPrinter"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/ModelPrinter 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "model"; type: "UnityMenuModel"; isPointer: true }
+        Property { name: "text"; type: "string"; isReadonly: true }
+        Method { name: "text"; type: "string" }
+    }
+    Component {
+        name: "NetworkActionState"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/NetworkActionState 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "NetworkActionStates"
+            values: {
+                "Connection": 1,
+                "SignalStrength": 2
+            }
+        }
+    }
+    Component {
+        name: "NetworkConnection"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/NetworkConnection 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "NetworkConnectionStates"
+            values: {
+                "Initial": 0,
+                "Activating": 1,
+                "Activated": 2,
+                "Deactivating": 3
+            }
+        }
+    }
+    Component {
+        name: "QAbstractProxyModel"
+        prototype: "QAbstractItemModel"
+        Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
+    }
+    Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
+    Component {
+        name: "RootActionState"
+        prototype: "ActionStateParser"
+        exports: ["Unity.Indicators/RootActionState 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }
+        Property { name: "valid"; type: "bool"; isReadonly: true }
+        Property { name: "title"; type: "string"; isReadonly: true }
+        Property { name: "leftLabel"; type: "string"; isReadonly: true }
+        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 }
+        Signal { name: "updated" }
+        Signal { name: "indexChanged" }
+    }
+    Component {
+        name: "UnityMenuModelCache"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "model"
+            type: "UnityMenuModel*"
+            Parameter { name: "path"; type: "string" }
+        }
+        Method {
+            name: "registerModel"
+            Parameter { name: "path"; type: "string" }
+            Parameter { name: "menuModel"; type: "UnityMenuModel"; isPointer: true }
+        }
+    }
+    Component {
+        name: "UnityMenuModelStack"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/UnityMenuModelStack 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "head"; type: "UnityMenuModel"; isPointer: true }
+        Property { name: "tail"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal {
+            name: "headChanged"
+            Parameter { name: "head"; type: "UnityMenuModel"; isPointer: true }
+        }
+        Signal {
+            name: "tailChanged"
+            Parameter { name: "tail"; type: "UnityMenuModel"; isPointer: true }
+        }
+        Signal {
+            name: "countChanged"
+            Parameter { name: "count"; type: "int" }
+        }
+        Method {
+            name: "push"
+            Parameter { name: "model"; type: "UnityMenuModel"; isPointer: true }
+            Parameter { name: "menuIndex"; type: "int" }
+        }
+        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" }
+        }
+    }
+}

=== removed directory 'plugins/Unity/Indicators/qml'
=== renamed file 'plugins/Unity/Indicators/qml/qmldir' => 'plugins/Unity/Indicators/qmldir'
--- plugins/Unity/Indicators/qml/qmldir	2014-05-02 22:57:00 +0000
+++ plugins/Unity/Indicators/qmldir	2014-06-26 10:07:27 +0000
@@ -4,7 +4,3 @@
 
 CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
 IndicatorBase 0.1 IndicatorBase.qml
-MenuItemFactory 0.1 MenuItemFactory.qml
-MessageMenuItemFactory 0.1 MessageMenuItemFactory.qml
-
-internal RemoveBackground RemoveBackground.qml

=== added file 'plugins/Unity/Launcher/Launcher.qmltypes'
--- plugins/Unity/Launcher/Launcher.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/Launcher.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,174 @@
+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 Unity.Launcher 0.1 plugins'
+
+Module {
+    Component {
+        name: "LauncherItem"
+        prototype: "unity::shell::launcher::LauncherItemInterface"
+        exports: ["Unity.Launcher/LauncherItem 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Signal {
+            name: "favoriteChanged"
+            Parameter { name: "favorite"; type: "bool" }
+        }
+        Signal {
+            name: "runningChanged"
+            Parameter { name: "running"; type: "bool" }
+        }
+    }
+    Component {
+        name: "LauncherModel"
+        prototype: "unity::shell::launcher::LauncherModelInterface"
+        exports: ["Unity.Launcher/LauncherModel 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "get"
+            type: "unity::shell::launcher::LauncherItemInterface*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "move"
+            Parameter { name: "oldIndex"; type: "int" }
+            Parameter { name: "newIndex"; type: "int" }
+        }
+        Method {
+            name: "pin"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "pin"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "requestRemove"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "quickListActionInvoked"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "actionIndex"; type: "int" }
+        }
+        Method {
+            name: "setUser"
+            Parameter { name: "username"; type: "string" }
+        }
+        Method {
+            name: "getUrlForAppId"
+            type: "string"
+            Parameter { name: "appId"; type: "string" }
+        }
+    }
+    Component {
+        name: "QuickListModel"
+        prototype: "unity::shell::launcher::QuickListModelInterface"
+        exports: ["Unity.Launcher/QuickListModel 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "unity::shell::launcher::LauncherItemInterface"
+        prototype: "QObject"
+        exports: ["Unity.Launcher/LauncherItemInterface 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "appId"; type: "string"; isReadonly: true }
+        Property { name: "name"; type: "string"; isReadonly: true }
+        Property { name: "icon"; type: "string"; isReadonly: true }
+        Property { name: "pinned"; type: "bool"; isReadonly: true }
+        Property { name: "running"; type: "bool"; isReadonly: true }
+        Property { name: "recent"; type: "bool"; isReadonly: true }
+        Property { name: "progress"; type: "int"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "focused"; type: "bool"; isReadonly: true }
+        Property {
+            name: "quickList"
+            type: "unity::shell::launcher::QuickListModelInterface"
+            isReadonly: true
+            isPointer: true
+        }
+        Signal {
+            name: "pinnedChanged"
+            Parameter { name: "pinned"; type: "bool" }
+        }
+        Signal {
+            name: "runningChanged"
+            Parameter { name: "running"; type: "bool" }
+        }
+        Signal {
+            name: "recentChanged"
+            Parameter { name: "running"; type: "bool" }
+        }
+        Signal {
+            name: "progressChanged"
+            Parameter { name: "progress"; type: "int" }
+        }
+        Signal {
+            name: "countChanged"
+            Parameter { name: "count"; type: "int" }
+        }
+        Signal {
+            name: "focusedChanged"
+            Parameter { name: "focused"; type: "bool" }
+        }
+    }
+    Component {
+        name: "unity::shell::launcher::LauncherModelInterface"
+        prototype: "QAbstractListModel"
+        exports: ["Unity.Launcher/LauncherModelInterface 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property {
+            name: "applicationManager"
+            type: "unity::shell::application::ApplicationManagerInterface"
+            isPointer: true
+        }
+        Method {
+            name: "move"
+            Parameter { name: "oldIndex"; type: "int" }
+            Parameter { name: "newIndex"; type: "int" }
+        }
+        Method {
+            name: "get"
+            type: "unity::shell::launcher::LauncherItemInterface*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "pin"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "pin"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "requestRemove"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "quickListActionInvoked"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "actionIndex"; type: "int" }
+        }
+        Method {
+            name: "setUser"
+            Parameter { name: "username"; type: "string" }
+        }
+    }
+    Component {
+        name: "unity::shell::launcher::QuickListModelInterface"
+        prototype: "QAbstractListModel"
+        exports: ["Unity.Launcher/QuickListInterface 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+    }
+}

=== added file 'plugins/Unity/Session/Session.qmltypes'
--- plugins/Unity/Session/Session.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Session/Session.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,25 @@
+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 Unity.Session 0.1 plugins'
+
+Module {
+    Component {
+        name: "DBusUnitySessionService"
+        prototype: "QObject"
+        exports: ["Unity.Session/DBusUnitySessionService 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Signal {
+            name: "logoutRequested"
+            Parameter { name: "have_inhibitors"; type: "bool" }
+        }
+        Signal { name: "logoutReady" }
+        Method { name: "Logout" }
+        Method { name: "RequestLogout" }
+    }
+}

=== added file 'plugins/Utils/Utils.qmltypes'
--- plugins/Utils/Utils.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Utils/Utils.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,143 @@
+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 Utils 0.1 plugins'
+
+Module {
+    Component {
+        name: "EasingCurve"
+        prototype: "QObject"
+        exports: ["Utils/EasingCurve 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "type"; type: "QEasingCurve::Type" }
+        Property { name: "period"; type: "double" }
+        Property { name: "progress"; type: "double" }
+        Property { name: "value"; type: "double"; isReadonly: true }
+    }
+    Component {
+        name: "QAbstractProxyModel"
+        prototype: "QAbstractItemModel"
+        Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
+    }
+    Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
+    Component {
+        name: "QLimitProxyModelQML"
+        prototype: "QIdentityProxyModel"
+        exports: ["Utils/LimitProxyModel 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
+        Property { name: "limit"; type: "int" }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal { name: "totalCountChanged" }
+    }
+    Component {
+        name: "QSortFilterProxyModel"
+        prototype: "QAbstractProxyModel"
+        Property { name: "filterRegExp"; type: "QRegExp" }
+        Property { name: "filterKeyColumn"; type: "int" }
+        Property { name: "dynamicSortFilter"; type: "bool" }
+        Property { name: "filterCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "sortCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "isSortLocaleAware"; type: "bool" }
+        Property { name: "sortRole"; type: "int" }
+        Property { name: "filterRole"; type: "int" }
+        Method {
+            name: "setFilterRegExp"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterWildcard"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterFixedString"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method { name: "clear" }
+        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: "TimeFormatter"
+        prototype: "QObject"
+        exports: ["Utils/GDateTimeFormatter 0.1", "Utils/TimeFormatter 0.1"]
+        exportMetaObjectRevisions: [0, 0]
+        Property { name: "format"; type: "string" }
+        Property { name: "timeString"; type: "string"; isReadonly: true }
+        Property { name: "time"; type: "qlonglong" }
+        Signal {
+            name: "formatChanged"
+            Parameter { name: "format"; type: "string" }
+        }
+        Signal {
+            name: "timeStringChanged"
+            Parameter { name: "timeString"; type: "string" }
+        }
+        Signal {
+            name: "timeChanged"
+            Parameter { name: "time"; type: "qlonglong" }
+        }
+    }
+    Component {
+        name: "UnityMenuModelPaths"
+        prototype: "QObject"
+        exports: ["Utils/UnityMenuModelPaths 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "source"; type: "QVariant" }
+        Property { name: "busName"; type: "QByteArray"; isReadonly: true }
+        Property { name: "actions"; type: "QVariantMap"; isReadonly: true }
+        Property { name: "menuObjectPath"; type: "QByteArray"; isReadonly: true }
+        Property { name: "busNameHint"; type: "QByteArray" }
+        Property { name: "actionsHint"; type: "QByteArray" }
+        Property { name: "menuObjectPathHint"; type: "QByteArray" }
+    }
+}

=== modified file 'qml/Panel/Indicators/DefaultIndicatorPage.qml'
--- qml/Panel/Indicators/DefaultIndicatorPage.qml	2013-12-13 14:59:04 +0000
+++ qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-06-26 10:07:27 +0000
@@ -22,7 +22,7 @@
 import Ubuntu.Components 0.1 as Components
 import Unity.Indicators 0.1 as Indicators
 
-Indicators.IndicatorBase {
+IndicatorBase {
     id: main
 
     //const
@@ -174,7 +174,7 @@
         }
     }
 
-    Indicators.MenuItemFactory {
+    MenuItemFactory {
         id: factory
         menuModel: mainMenu.model ? mainMenu.model : null
     }

=== modified file 'qml/Panel/Indicators/DefaultIndicatorWidget.qml'
--- qml/Panel/Indicators/DefaultIndicatorWidget.qml	2013-12-12 09:55:17 +0000
+++ qml/Panel/Indicators/DefaultIndicatorWidget.qml	2014-06-26 10:07:27 +0000
@@ -19,9 +19,8 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Unity.Indicators 0.1 as Indicators
 
-Indicators.IndicatorBase {
+IndicatorBase {
     id: indicatorWidget
 
     property int iconSize: height

=== renamed file 'plugins/Unity/Indicators/qml/IndicatorBase.qml' => 'qml/Panel/Indicators/IndicatorBase.qml'
--- plugins/Unity/Indicators/qml/IndicatorBase.qml	2013-11-24 02:23:56 +0000
+++ qml/Panel/Indicators/IndicatorBase.qml	2014-06-26 10:07:27 +0000
@@ -36,7 +36,7 @@
 
     property alias menuModel: cachedModel.model
 
-    CachedUnityMenuModel {
+    Indicators.CachedUnityMenuModel {
         id: cachedModel
         busName: indicatorItem.busName
         actionsObjectPath: indicatorItem.actionsObjectPath

=== modified file 'qml/Panel/Indicators/IndicatorDelegate.qml'
--- qml/Panel/Indicators/IndicatorDelegate.qml	2014-01-14 15:35:57 +0000
+++ qml/Panel/Indicators/IndicatorDelegate.qml	2014-06-26 10:07:27 +0000
@@ -18,9 +18,8 @@
  */
 
 import QtQuick 2.0
-import Unity.Indicators 0.1 as Indicators
 
-Indicators.IndicatorBase {
+IndicatorBase {
     enabled: false
 
     onRootActionStateChanged: {

=== renamed file 'plugins/Unity/Indicators/qml/MenuItemFactory.qml' => 'qml/Panel/Indicators/MenuItemFactory.qml'
=== renamed file 'plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml' => 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
=== renamed file 'plugins/Unity/Indicators/qml/RemoveBackground.qml' => 'qml/Panel/Indicators/RemoveBackground.qml'
=== added file 'tests/mocks/AccountsService/AccountsService.qmltypes'
--- tests/mocks/AccountsService/AccountsService.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/AccountsService/AccountsService.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,22 @@
+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 AccountsService 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "AccountsService"
+        prototype: "QObject"
+        exports: ["AccountsService/AccountsService 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "user"; type: "string" }
+        Property { name: "demoEdges"; type: "bool" }
+        Property { name: "backgroundFile"; type: "string" }
+        Property { name: "statsWelcomeScreen"; type: "bool" }
+    }
+}

=== added file 'tests/mocks/GSettings.1.0/GSettings.qmltypes'
--- tests/mocks/GSettings.1.0/GSettings.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/GSettings.1.0/GSettings.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,42 @@
+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 GSettings 1.0 tests/mocks'
+
+Module {
+    Component {
+        name: "GSettingsControllerQml"
+        prototype: "QObject"
+        exports: ["GSettings/GSettingsController 1.0"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "setPictureUri"
+            Parameter { name: "str"; type: "string" }
+        }
+    }
+    Component {
+        name: "GSettingsQml"
+        prototype: "QObject"
+        exports: ["GSettings/GSettings 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "schema"; type: "GSettingsSchemaQml"; isReadonly: true; isPointer: true }
+        Property { name: "pictureUri"; type: "string" }
+        Signal {
+            name: "pictureUriChanged"
+            Parameter { type: "string" }
+        }
+    }
+    Component {
+        name: "GSettingsSchemaQml"
+        prototype: "QObject"
+        exports: ["GSettings/GSettingsSchema 1.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "id"; type: "QByteArray" }
+    }
+}

=== added file 'tests/mocks/HudClient/HudClient.qmltypes'
--- tests/mocks/HudClient/HudClient.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/HudClient/HudClient.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,113 @@
+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 HudClient 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "DeeListModel"
+        prototype: "QAbstractListModel"
+        Property { name: "name"; type: "string" }
+        Property { name: "synchronized"; type: "bool"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal {
+            name: "nameChanged"
+            Parameter { type: "string" }
+        }
+        Signal {
+            name: "synchronizedChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "roleNamesChanged"
+            Parameter { type: "QHash<int,QByteArray>" }
+        }
+        Method {
+            name: "get"
+            type: "QVariantMap"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method { name: "count"; type: "int" }
+    }
+    Component {
+        name: "HudClient"
+        prototype: "QObject"
+        exports: ["HudClient/HudClient 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "results"; type: "DeeListModel"; isReadonly: true; isPointer: true }
+        Property { name: "toolBarModel"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
+        Signal { name: "voiceQueryLoading" }
+        Signal { name: "voiceQueryListening" }
+        Signal { name: "voiceQueryHeardSomething" }
+        Signal { name: "voiceQueryFailed" }
+        Signal {
+            name: "voiceQueryFinished"
+            Parameter { name: "query"; type: "string" }
+        }
+        Signal { name: "commandExecuted" }
+        Signal {
+            name: "showParametrizedAction"
+            Parameter { name: "action"; type: "string" }
+            Parameter { name: "items"; type: "QVariant" }
+        }
+        Method {
+            name: "executeCommand"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "setQuery"
+            Parameter { name: "new_query"; type: "string" }
+        }
+        Method { name: "startVoiceQuery" }
+        Method {
+            name: "executeParametrizedAction"
+            Parameter { name: "values"; type: "QVariant" }
+        }
+        Method {
+            name: "updateParametrizedAction"
+            Parameter { name: "values"; type: "QVariant" }
+        }
+        Method { name: "cancelParametrizedAction" }
+        Method {
+            name: "executeToolBarAction"
+            Parameter { name: "action"; type: "HudClientQueryToolbarItems" }
+        }
+    }
+    Component {
+        name: "HudClientStub"
+        prototype: "QObject"
+        exports: ["HudClient/HudClientStub 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "lastExecutedToolbarItem"; type: "int"; isReadonly: true }
+        Property { name: "lastSetQuery"; type: "string"; isReadonly: true }
+        Property { name: "lastExecutedCommandRow"; type: "int"; isReadonly: true }
+        Property { name: "lastExecutedParametrizedCommandRow"; type: "int"; isReadonly: true }
+        Property { name: "lastParametrizedCommandCommited"; type: "bool"; isReadonly: true }
+        Property { name: "activatedActions"; type: "QVariantMap"; isReadonly: true }
+        Method { name: "reset" }
+        Method { name: "fullScreenToolbarItemValue"; type: "int" }
+        Method { name: "helpToolbarItemValue"; type: "int" }
+        Method { name: "preferencesToolbarItemValue"; type: "int" }
+        Method { name: "undoToolbarItemValue"; type: "int" }
+        Method {
+            name: "setHelpToolbarItemEnabled"
+            Parameter { name: "enabled"; type: "bool" }
+        }
+    }
+    Component { name: "HudToolBarModel"; prototype: "QAbstractListModel" }
+    Component {
+        name: "VolumePeakDetector"
+        prototype: "QObject"
+        exports: ["HudClient/VolumePeakDetector 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "enabled"; type: "bool" }
+        Property { name: "desiredInterval"; type: "int" }
+        Signal {
+            name: "newPeak"
+            Parameter { name: "volume"; type: "float" }
+        }
+    }
+}

=== added file 'tests/mocks/LightDM/LightDM.qmltypes'
--- tests/mocks/LightDM/LightDM.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/LightDM.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,241 @@
+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 LightDM 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "Greeter"
+        prototype: "QObject"
+        exports: ["LightDM/Greeter 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "authenticated"; type: "bool"; isReadonly: true }
+        Property { name: "authenticationUser"; type: "string"; isReadonly: true }
+        Property { name: "promptless"; type: "bool"; isReadonly: true }
+        Signal {
+            name: "showMessage"
+            Parameter { name: "text"; type: "string" }
+            Parameter { name: "isError"; type: "bool" }
+        }
+        Signal {
+            name: "showPrompt"
+            Parameter { name: "text"; type: "string" }
+            Parameter { name: "isSecret"; type: "bool" }
+        }
+        Signal { name: "authenticationComplete" }
+        Signal {
+            name: "authenticationUserChanged"
+            Parameter { name: "user"; type: "string" }
+        }
+        Signal {
+            name: "requestAuthenticationUser"
+            Parameter { name: "user"; type: "string" }
+        }
+        Method {
+            name: "authenticate"
+            Parameter { name: "username"; type: "string" }
+        }
+        Method { name: "authenticate" }
+        Method {
+            name: "respond"
+            Parameter { name: "response"; type: "string" }
+        }
+        Method {
+            name: "startSessionSync"
+            type: "bool"
+            Parameter { name: "session"; type: "string" }
+        }
+        Method { name: "startSessionSync"; type: "bool" }
+    }
+    Component {
+        name: "QAbstractProxyModel"
+        prototype: "QAbstractItemModel"
+        Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
+    }
+    Component {
+        name: "QLightDM::UsersModel"
+        prototype: "QAbstractListModel"
+        exports: ["LightDM/UserRoles 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "UserModelRoles"
+            values: {
+                "NameRole": 256,
+                "RealNameRole": 257,
+                "LoggedInRole": 258,
+                "BackgroundRole": 259,
+                "SessionRole": 260,
+                "HasMessagesRole": 261,
+                "ImagePathRole": 262,
+                "BackgroundPathRole": 263
+            }
+        }
+    }
+    Component {
+        name: "QSortFilterProxyModel"
+        prototype: "QAbstractProxyModel"
+        Property { name: "filterRegExp"; type: "QRegExp" }
+        Property { name: "filterKeyColumn"; type: "int" }
+        Property { name: "dynamicSortFilter"; type: "bool" }
+        Property { name: "filterCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "sortCaseSensitivity"; type: "Qt::CaseSensitivity" }
+        Property { name: "isSortLocaleAware"; type: "bool" }
+        Property { name: "sortRole"; type: "int" }
+        Property { name: "filterRole"; type: "int" }
+        Method {
+            name: "setFilterRegExp"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterWildcard"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method {
+            name: "setFilterFixedString"
+            Parameter { name: "pattern"; type: "string" }
+        }
+        Method { name: "clear" }
+        Method { name: "invalidate" }
+    }
+    Component {
+        name: "QSortFilterProxyModelQML"
+        prototype: "QSortFilterProxyModel"
+        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: "UserMetricsOutput::ColorTheme"
+        prototype: "QObject"
+        Property { name: "start"; type: "QColor"; isReadonly: true }
+        Property { name: "main"; type: "QColor"; isReadonly: true }
+        Property { name: "end"; type: "QColor"; isReadonly: true }
+        Signal {
+            name: "startChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "mainChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "endChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+    }
+    Component {
+        name: "UserMetricsOutput::UserMetrics"
+        prototype: "QObject"
+        exports: ["LightDM/Infographic 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "label"; type: "string"; isReadonly: true }
+        Property { name: "username"; type: "string" }
+        Property {
+            name: "firstColor"
+            type: "UserMetricsOutput::ColorTheme"
+            isReadonly: true
+            isPointer: true
+        }
+        Property {
+            name: "secondColor"
+            type: "UserMetricsOutput::ColorTheme"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "firstMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
+        Property { name: "secondMonth"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
+        Property { name: "currentDay"; type: "int"; isReadonly: true }
+        Signal {
+            name: "labelChanged"
+            Parameter { name: "label"; type: "string" }
+        }
+        Signal {
+            name: "usernameChanged"
+            Parameter { name: "username"; type: "string" }
+        }
+        Signal {
+            name: "firstColorChanged"
+            Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
+        }
+        Signal {
+            name: "firstMonthChanged"
+            Parameter { name: "firstMonth"; type: "QAbstractItemModel"; isPointer: true }
+        }
+        Signal {
+            name: "currentDayChanged"
+            Parameter { name: "currentDay"; type: "int" }
+        }
+        Signal {
+            name: "secondColorChanged"
+            Parameter { name: "color"; type: "ColorTheme"; isPointer: true }
+        }
+        Signal {
+            name: "secondMonthChanged"
+            Parameter { name: "secondMonth"; type: "QAbstractItemModel"; isPointer: true }
+        }
+        Signal { name: "nextDataSource" }
+        Signal { name: "readyForDataChange" }
+        Signal { name: "dataAboutToAppear" }
+        Signal { name: "dataAppeared" }
+        Signal { name: "dataAboutToChange" }
+        Signal { name: "dataChanged" }
+        Signal { name: "dataAboutToDisappear" }
+        Signal { name: "dataDisappeared" }
+        Method { name: "nextDataSourceSlot" }
+        Method { name: "readyForDataChangeSlot" }
+    }
+    Component {
+        name: "UsersModel"
+        prototype: "QSortFilterProxyModelQML"
+        exports: ["LightDM/Users 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+    }
+}

=== added file 'tests/mocks/Powerd/Powerd.qmltypes'
--- tests/mocks/Powerd/Powerd.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Powerd/Powerd.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,46 @@
+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 Powerd 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "Powerd"
+        prototype: "QObject"
+        exports: ["Powerd/Powerd 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "DisplayFlag"
+            values: {
+                "UseProximity": 1,
+                "DisableAutoBrightness": 2,
+                "Bright": 4
+            }
+        }
+        Enum {
+            name: "DisplayFlags"
+            values: {
+                "UseProximity": 1,
+                "DisableAutoBrightness": 2,
+                "Bright": 4
+            }
+        }
+        Enum {
+            name: "Status"
+            values: {
+                "Off": 0,
+                "On": 1
+            }
+        }
+        Signal {
+            name: "displayPowerStateChange"
+            Parameter { name: "status"; type: "int" }
+            Parameter { name: "flags"; type: "uint" }
+        }
+    }
+}

=== added file 'tests/mocks/QMenuModel/QMenuModel.qmltypes'
--- tests/mocks/QMenuModel/QMenuModel.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/QMenuModel/QMenuModel.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,77 @@
+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 QMenuModel 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "ActionStateParser"
+        prototype: "QObject"
+        exports: ["QMenuModel/ActionStateParser 0.1"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "UnityMenuModel"
+        prototype: "QAbstractListModel"
+        exports: ["QMenuModel/UnityMenuModel 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "modelData"; type: "QVariant" }
+        Property { name: "busName"; type: "QByteArray" }
+        Property { name: "actions"; type: "QVariantMap" }
+        Property { name: "menuObjectPath"; type: "QByteArray" }
+        Property { name: "actionStateParser"; type: "ActionStateParser"; isPointer: true }
+        Method {
+            name: "insertRow"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "data"; type: "QVariant" }
+        }
+        Method {
+            name: "appendRow"
+            Parameter { name: "data"; type: "QVariant" }
+        }
+        Method {
+            name: "removeRow"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "submenu"
+            type: "QObject*"
+            Parameter { name: "position"; type: "int" }
+            Parameter { name: "actionStateParser"; type: "QQmlComponent"; isPointer: true }
+        }
+        Method {
+            name: "submenu"
+            type: "QObject*"
+            Parameter { name: "position"; type: "int" }
+        }
+        Method {
+            name: "loadExtendedAttributes"
+            type: "bool"
+            Parameter { name: "position"; type: "int" }
+            Parameter { name: "schema"; type: "QVariantMap" }
+        }
+        Method {
+            name: "get"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "QByteArray" }
+        }
+        Method {
+            name: "activate"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "parameter"; type: "QVariant" }
+        }
+        Method {
+            name: "activate"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "changeState"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "parameter"; type: "QVariant" }
+        }
+    }
+}

=== added file 'tests/mocks/QtMultimedia/QtMultimedia.qmltypes'
--- tests/mocks/QtMultimedia/QtMultimedia.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/QtMultimedia/QtMultimedia.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,52 @@
+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 QtMultimedia 5.0 tests/mocks'
+
+Module {
+    Component {
+        name: "Audio"
+        prototype: "QObject"
+        exports: ["QtMultimedia/Audio 5.0"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "PlaybackState"
+            values: {
+                "PlayingState": 0,
+                "PausedState": 1,
+                "StoppedState": 2
+            }
+        }
+        Property { name: "source"; type: "QUrl" }
+        Property { name: "playbackState"; type: "PlaybackState"; isReadonly: true }
+        Property { name: "position"; type: "int"; isReadonly: true }
+        Property { name: "duration"; type: "int"; isReadonly: true }
+        Property { name: "errorString"; type: "string"; isReadonly: true }
+        Signal {
+            name: "sourceChanged"
+            Parameter { name: "source"; type: "QUrl" }
+        }
+        Signal {
+            name: "playbackStateChanged"
+            Parameter { name: "playbackState"; type: "PlaybackState" }
+        }
+        Signal {
+            name: "positionChanged"
+            Parameter { name: "position"; type: "int" }
+        }
+        Signal {
+            name: "durationChanged"
+            Parameter { name: "duration"; type: "int" }
+        }
+        Signal {
+            name: "errorStringChanged"
+            Parameter { name: "errorString"; type: "string" }
+        }
+        Method { name: "pause" }
+        Method { name: "play" }
+        Method { name: "stop" }
+    }
+}

=== added file 'tests/mocks/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypes'
--- tests/mocks/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,60 @@
+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.DownloadDaemonListener 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "MockDownloadTracker"
+        prototype: "QObject"
+        exports: ["Ubuntu.DownloadDaemonListener/DownloadTracker 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "service"; type: "string" }
+        Property { name: "dbusPath"; type: "string" }
+        Property { name: "serviceReady"; type: "bool"; isReadonly: true }
+        Signal {
+            name: "serviceChanged"
+            Parameter { name: "service"; type: "string" }
+        }
+        Signal {
+            name: "dbusPathChanged"
+            Parameter { name: "dbusPath"; type: "string" }
+        }
+        Signal {
+            name: "serviceReadyChanged"
+            Parameter { name: "serviceReady"; type: "bool" }
+        }
+        Signal {
+            name: "canceled"
+            Parameter { name: "success"; type: "bool" }
+        }
+        Signal {
+            name: "error"
+            Parameter { name: "error"; type: "string" }
+        }
+        Signal {
+            name: "finished"
+            Parameter { name: "path"; type: "string" }
+        }
+        Signal {
+            name: "paused"
+            Parameter { name: "success"; type: "bool" }
+        }
+        Signal {
+            name: "progress"
+            Parameter { name: "received"; type: "qulonglong" }
+            Parameter { name: "total"; type: "qulonglong" }
+        }
+        Signal {
+            name: "resumed"
+            Parameter { name: "success"; type: "bool" }
+        }
+        Signal {
+            name: "started"
+            Parameter { name: "success"; type: "bool" }
+        }
+    }
+}

=== added file 'tests/mocks/Ubuntu/Thumbnailer/Thumbnailer.qmltypes'
--- tests/mocks/Ubuntu/Thumbnailer/Thumbnailer.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Ubuntu/Thumbnailer/Thumbnailer.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,17 @@
+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.Thumbnailer 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "QQmlTypeNotAvailable"
+        prototype: "QObject"
+        exports: ["Ubuntu.Thumbnailer/__ThumbnailerIgnoreMe 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+    }
+}

=== added file 'tests/mocks/Unity/Application/Application.qmltypes'
--- tests/mocks/Unity/Application/Application.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/Application.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,313 @@
+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 Unity.Application 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "ApplicationImage"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        exports: ["Unity.Application/ApplicationImage 0.1"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "FillMode"
+            values: {
+                "Stretch": 0,
+                "PreserveAspectCrop": 1
+            }
+        }
+        Property { name: "source"; type: "ApplicationInfo"; isPointer: true }
+        Property { name: "fillMode"; type: "FillMode" }
+        Property { name: "ready"; type: "bool" }
+        Method { name: "scheduleUpdate" }
+        Method { name: "updateFromCache" }
+    }
+    Component {
+        name: "ApplicationInfo"
+        prototype: "unity::shell::application::ApplicationInfoInterface"
+        exports: ["Unity.Application/ApplicationInfo 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "fullscreen"; type: "bool" }
+        Property { name: "stage"; type: "Stage" }
+        Property { name: "imageQml"; type: "string" }
+        Property { name: "windowQml"; type: "string" }
+        Signal { name: "appIdChanged" }
+        Signal { name: "nameChanged" }
+        Signal { name: "commentChanged" }
+        Signal { name: "iconChanged" }
+        Signal { name: "stateChanged" }
+        Signal { name: "focusedChanged" }
+        Signal { name: "screenshotChanged" }
+    }
+    Component {
+        name: "ApplicationManager"
+        prototype: "unity::shell::application::ApplicationManagerInterface"
+        exports: ["Unity.Application/ApplicationManager 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Role"
+            values: {
+                "Dash": 0,
+                "Default": 1,
+                "Indicators": 2,
+                "Notifications": 3,
+                "Greeter": 4,
+                "Launcher": 5,
+                "OnScreenKeyboard": 6,
+                "ShutdownDialog": 7
+            }
+        }
+        Enum {
+            name: "StageHint"
+            values: {
+                "MainStage": 0,
+                "IntegrationStage": 1,
+                "ShareStage": 2,
+                "ContentPickingStage": 3,
+                "SideStage": 4,
+                "ConfigurationStage": 5
+            }
+        }
+        Enum {
+            name: "FormFactorHint"
+            values: {
+                "DesktopFormFactor": 0,
+                "PhoneFormFactor": 1,
+                "TabletFormFactor": 2
+            }
+        }
+        Enum {
+            name: "FavoriteApplication"
+            values: {
+                "CameraApplication": 0,
+                "GalleryApplication": 1,
+                "BrowserApplication": 2,
+                "ShareApplication": 3,
+                "PhoneApplication": 4,
+                "DialerApplication": 5,
+                "MessagingApplication": 6,
+                "AddressbookApplication": 7
+            }
+        }
+        Enum {
+            name: "ExecFlags"
+            values: {
+                "NoFlag": 0,
+                "ForceMainStage": 1
+            }
+        }
+        Property { name: "keyboardHeight"; type: "int"; isReadonly: true }
+        Property { name: "keyboardVisible"; type: "bool"; isReadonly: true }
+        Property { name: "sideStageWidth"; type: "int"; isReadonly: true }
+        Property { name: "stageHint"; type: "StageHint"; isReadonly: true }
+        Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }
+        Property { name: "fake"; type: "bool"; isReadonly: true }
+        Property { name: "rightMargin"; type: "int" }
+        Signal {
+            name: "focusRequested"
+            Parameter { name: "favoriteApplication"; type: "FavoriteApplication" }
+        }
+        Signal {
+            name: "focusRequested"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "get"
+            type: "ApplicationInfo*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "findApplication"
+            type: "ApplicationInfo*"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "move"
+            Parameter { name: "from"; type: "int" }
+            Parameter { name: "to"; type: "int" }
+        }
+        Method {
+            name: "requestFocusApplication"
+            type: "bool"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "focusApplication"
+            type: "bool"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method { name: "unfocusCurrentApplication" }
+        Method {
+            name: "startApplication"
+            type: "ApplicationInfo*"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "arguments"; type: "QStringList" }
+        }
+        Method {
+            name: "startApplication"
+            type: "ApplicationInfo*"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "startApplication"
+            type: "ApplicationInfo*"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "flags"; type: "ExecFlags" }
+            Parameter { name: "arguments"; type: "QStringList" }
+        }
+        Method {
+            name: "startApplication"
+            type: "ApplicationInfo*"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "flags"; type: "ExecFlags" }
+        }
+        Method {
+            name: "stopApplication"
+            type: "bool"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "updateScreenshot"
+            type: "bool"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method { name: "availableApplications"; type: "QStringList" }
+    }
+    Component {
+        name: "unity::shell::application::ApplicationInfoInterface"
+        prototype: "QObject"
+        exports: ["Unity.Application/ApplicationInfoInterface 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Stage"
+            values: {
+                "MainStage": 0,
+                "SideStage": 1
+            }
+        }
+        Enum {
+            name: "State"
+            values: {
+                "Starting": 0,
+                "Running": 1,
+                "Suspended": 2,
+                "Stopped": 3
+            }
+        }
+        Property { name: "appId"; type: "string"; isReadonly: true }
+        Property { name: "name"; type: "string"; isReadonly: true }
+        Property { name: "comment"; type: "string"; isReadonly: true }
+        Property { name: "icon"; type: "QUrl"; isReadonly: true }
+        Property { name: "stage"; type: "Stage"; isReadonly: true }
+        Property { name: "state"; type: "State"; isReadonly: true }
+        Property { name: "focused"; type: "bool"; isReadonly: true }
+        Property { name: "screenshot"; type: "QUrl"; isReadonly: true }
+        Signal {
+            name: "nameChanged"
+            Parameter { name: "name"; type: "string" }
+        }
+        Signal {
+            name: "commentChanged"
+            Parameter { name: "comment"; type: "string" }
+        }
+        Signal {
+            name: "iconChanged"
+            Parameter { name: "icon"; type: "QUrl" }
+        }
+        Signal {
+            name: "stageChanged"
+            Parameter { name: "stage"; type: "Stage" }
+        }
+        Signal {
+            name: "stateChanged"
+            Parameter { name: "state"; type: "State" }
+        }
+        Signal {
+            name: "focusedChanged"
+            Parameter { name: "focused"; type: "bool" }
+        }
+        Signal {
+            name: "screenshotChanged"
+            Parameter { name: "screenshot"; type: "QUrl" }
+        }
+    }
+    Component {
+        name: "unity::shell::application::ApplicationManagerInterface"
+        prototype: "QAbstractListModel"
+        exports: ["Unity.Application/ApplicationManagerInterface 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Roles"
+            values: {
+                "RoleAppId": 256,
+                "RoleName": 257,
+                "RoleComment": 258,
+                "RoleIcon": 259,
+                "RoleStage": 260,
+                "RoleState": 261,
+                "RoleFocused": 262,
+                "RoleScreenshot": 263
+            }
+        }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "focusedApplicationId"; type: "string"; isReadonly: true }
+        Property { name: "suspended"; type: "bool" }
+        Signal {
+            name: "focusRequested"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Signal {
+            name: "applicationAdded"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Signal {
+            name: "applicationRemoved"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "get"
+            type: "unity::shell::application::ApplicationInfoInterface*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "findApplication"
+            type: "unity::shell::application::ApplicationInfoInterface*"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "requestFocusApplication"
+            type: "bool"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "focusApplication"
+            type: "bool"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method { name: "unfocusCurrentApplication" }
+        Method {
+            name: "startApplication"
+            type: "unity::shell::application::ApplicationInfoInterface*"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "arguments"; type: "QStringList" }
+        }
+        Method {
+            name: "stopApplication"
+            type: "bool"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "updateScreenshot"
+            type: "bool"
+            Parameter { name: "appId"; type: "string" }
+        }
+    }
+}

=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
--- tests/mocks/Unity/Application/CMakeLists.txt	2014-05-15 14:57:23 +0000
+++ tests/mocks/Unity/Application/CMakeLists.txt	2014-06-26 10:07:27 +0000
@@ -22,4 +22,5 @@
 add_unity8_mock(Unity.Application 0.1 Unity/Application
                 PREFIX nonmirplugins
                 TARGETS NonMirUnityApplicationQml
-                BINARY_DIR ${CMAKE_BINARY_DIR}/nonmirplugins)
+                BINARY_DIR ${CMAKE_BINARY_DIR}/nonmirplugins
+                NO_TYPES)

=== added file 'tests/mocks/Unity/Indicators/Indicators.qmltypes'
--- tests/mocks/Unity/Indicators/Indicators.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Indicators/Indicators.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,210 @@
+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 Unity.Indicators 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "ActionState"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/ActionState 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "ActionStates"
+            values: {
+                "Label": 0,
+                "IconSource": 1,
+                "AccessableName": 2,
+                "Visible": 3
+            }
+        }
+    }
+    Component {
+        name: "FakeIndicatorsModel"
+        prototype: "QAbstractListModel"
+        exports: ["Unity.Indicators/FakeIndicatorsModel 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Method {
+            name: "load"
+            Parameter { name: "profile"; type: "string" }
+        }
+        Method { name: "unload" }
+        Method {
+            name: "append"
+            Parameter { name: "row"; type: "QVariantMap" }
+        }
+        Method {
+            name: "data"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "int" }
+        }
+    }
+    Component {
+        name: "FlatMenuProxyModelRole"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/FlatMenuProxyModelRole 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Roles"
+            values: {
+                "Action": 1,
+                "Label": 2,
+                "Extra": 3,
+                "Depth": 4,
+                "hasSection": 5,
+                "hasSubMenu": 6
+            }
+        }
+    }
+    Component {
+        name: "IndicatorsModelRole"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/IndicatorsModelRole 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Roles"
+            values: {
+                "Identifier": 0,
+                "Position": 1,
+                "WidgetSource": 2,
+                "PageSource": 3,
+                "IndicatorProperties": 4,
+                "IsVisible": 5
+            }
+        }
+    }
+    Component {
+        name: "MenuContentActivator"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/MenuContentActivator 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "baseIndex"; type: "int" }
+        Property { name: "running"; type: "bool" }
+        Property { name: "count"; type: "int" }
+        Property { name: "content"; type: "MenuContentState"; isList: true; isReadonly: true }
+        Signal {
+            name: "baseIndexChanged"
+            Parameter { name: "baseIndex"; type: "int" }
+        }
+        Signal {
+            name: "deltaChanged"
+            Parameter { name: "delta"; type: "int" }
+        }
+        Signal {
+            name: "runningChanged"
+            Parameter { name: "running"; type: "bool" }
+        }
+        Signal {
+            name: "countChanged"
+            Parameter { name: "count"; type: "int" }
+        }
+        Method { name: "restart" }
+        Method { name: "stop" }
+        Method { name: "clear" }
+        Method {
+            name: "isMenuContentActive"
+            type: "bool"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
+        name: "MenuContentState"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/MenuContentState 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "active"; type: "bool"; isReadonly: true }
+    }
+    Component {
+        name: "NetworkActionState"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/NetworkActionState 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "NetworkActionStates"
+            values: {
+                "Connection": 1,
+                "SignalStrength": 2
+            }
+        }
+    }
+    Component {
+        name: "NetworkConnection"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/NetworkConnection 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "NetworkConnectionStates"
+            values: {
+                "Initial": 0,
+                "Activating": 1,
+                "Activated": 2,
+                "Deactivating": 3
+            }
+        }
+    }
+    Component {
+        name: "QAbstractProxyModel"
+        prototype: "QAbstractItemModel"
+        Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
+    }
+    Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
+    Component {
+        name: "UnityMenuModelStack"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/UnityMenuModelStack 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "head"; type: "UnityMenuModel"; isPointer: true }
+        Property { name: "tail"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal {
+            name: "headChanged"
+            Parameter { name: "head"; type: "UnityMenuModel"; isPointer: true }
+        }
+        Signal {
+            name: "tailChanged"
+            Parameter { name: "tail"; type: "UnityMenuModel"; isPointer: true }
+        }
+        Signal {
+            name: "countChanged"
+            Parameter { name: "count"; type: "int" }
+        }
+        Method {
+            name: "push"
+            Parameter { name: "model"; type: "UnityMenuModel"; isPointer: true }
+            Parameter { name: "menuIndex"; type: "int" }
+        }
+        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" }
+        }
+    }
+}

=== removed file 'tests/mocks/Unity/Indicators/MenuItemFactory.qml'
--- tests/mocks/Unity/Indicators/MenuItemFactory.qml	2013-12-13 13:12:40 +0000
+++ tests/mocks/Unity/Indicators/MenuItemFactory.qml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Nick Dedekind <[e-mail]>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-Item {
-    id: menuFactory
-
-    property var menuModel: null
-
-    Component {
-        id: standardMenu;
-        ListItem.Standard {
-            objectName: "standardMenu"
-        }
-    }
-
-    function load(modelData) {
-        return standardMenu;
-    }
-}

=== modified file 'tests/mocks/Unity/Indicators/qmldir'
--- tests/mocks/Unity/Indicators/qmldir	2014-05-02 22:57:21 +0000
+++ tests/mocks/Unity/Indicators/qmldir	2014-06-26 10:07:27 +0000
@@ -6,5 +6,4 @@
 IndicatorBase 0.1 IndicatorBase.qml
 IndicatorsModel 0.1 IndicatorsModel.qml
 FakeMenuPage 0.1 FakeMenuPage.qml
-MenuItemFactory 0.1 MenuItemFactory.qml
 RootActionState 0.1 RootActionState.qml

=== added file 'tests/mocks/Unity/Launcher/Launcher.qmltypes'
--- tests/mocks/Unity/Launcher/Launcher.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Launcher/Launcher.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,171 @@
+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 Unity.Launcher 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "MockLauncherItem"
+        prototype: "unity::shell::launcher::LauncherItemInterface"
+        exports: ["Unity.Launcher/LauncherItem 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "MockLauncherModel"
+        prototype: "unity::shell::launcher::LauncherModelInterface"
+        exports: ["Unity.Launcher/LauncherModel 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Signal {
+            name: "quickListTriggered"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "get"
+            type: "unity::shell::launcher::LauncherItemInterface*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "move"
+            Parameter { name: "oldIndex"; type: "int" }
+            Parameter { name: "newIndex"; type: "int" }
+        }
+        Method {
+            name: "pin"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "pin"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "requestRemove"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "quickListActionInvoked"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "actionIndex"; type: "int" }
+        }
+        Method {
+            name: "setUser"
+            Parameter { name: "username"; type: "string" }
+        }
+        Method {
+            name: "getUrlForAppId"
+            type: "string"
+            Parameter { name: "appId"; type: "string" }
+        }
+    }
+    Component {
+        name: "MockQuickListModel"
+        prototype: "unity::shell::launcher::QuickListModelInterface"
+        exports: ["Unity.Launcher/QuickListModel 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "unity::shell::launcher::LauncherItemInterface"
+        prototype: "QObject"
+        exports: ["Unity.Launcher/LauncherItemInterface 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "appId"; type: "string"; isReadonly: true }
+        Property { name: "name"; type: "string"; isReadonly: true }
+        Property { name: "icon"; type: "string"; isReadonly: true }
+        Property { name: "pinned"; type: "bool"; isReadonly: true }
+        Property { name: "running"; type: "bool"; isReadonly: true }
+        Property { name: "recent"; type: "bool"; isReadonly: true }
+        Property { name: "progress"; type: "int"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "focused"; type: "bool"; isReadonly: true }
+        Property {
+            name: "quickList"
+            type: "unity::shell::launcher::QuickListModelInterface"
+            isReadonly: true
+            isPointer: true
+        }
+        Signal {
+            name: "pinnedChanged"
+            Parameter { name: "pinned"; type: "bool" }
+        }
+        Signal {
+            name: "runningChanged"
+            Parameter { name: "running"; type: "bool" }
+        }
+        Signal {
+            name: "recentChanged"
+            Parameter { name: "running"; type: "bool" }
+        }
+        Signal {
+            name: "progressChanged"
+            Parameter { name: "progress"; type: "int" }
+        }
+        Signal {
+            name: "countChanged"
+            Parameter { name: "count"; type: "int" }
+        }
+        Signal {
+            name: "focusedChanged"
+            Parameter { name: "focused"; type: "bool" }
+        }
+    }
+    Component {
+        name: "unity::shell::launcher::LauncherModelInterface"
+        prototype: "QAbstractListModel"
+        exports: ["Unity.Launcher/LauncherModelInterface 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property {
+            name: "applicationManager"
+            type: "unity::shell::application::ApplicationManagerInterface"
+            isPointer: true
+        }
+        Method {
+            name: "move"
+            Parameter { name: "oldIndex"; type: "int" }
+            Parameter { name: "newIndex"; type: "int" }
+        }
+        Method {
+            name: "get"
+            type: "unity::shell::launcher::LauncherItemInterface*"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "pin"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "pin"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "requestRemove"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
+            name: "quickListActionInvoked"
+            Parameter { name: "appId"; type: "string" }
+            Parameter { name: "actionIndex"; type: "int" }
+        }
+        Method {
+            name: "setUser"
+            Parameter { name: "username"; type: "string" }
+        }
+    }
+    Component {
+        name: "unity::shell::launcher::QuickListModelInterface"
+        prototype: "QAbstractListModel"
+        exports: ["Unity.Launcher/QuickListModelInterface 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+    }
+}

=== added file 'tests/mocks/Unity/Notifications/Notifications.qmltypes'
--- tests/mocks/Unity/Notifications/Notifications.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/Notifications.qmltypes	2014-06-26 10:07:27 +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 Unity.Notifications 1.0 tests/mocks'
+
+Module {
+}

=== added file 'tests/mocks/Unity/Unity.qmltypes'
--- tests/mocks/Unity/Unity.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Unity.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,345 @@
+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 Unity 0.2 tests/mocks'
+
+Module {
+    Component {
+        name: "Categories"
+        prototype: "unity::shell::scopes::CategoriesInterface"
+        Method {
+            name: "addSpecialCategory"
+            Parameter { name: "categoryId"; type: "string" }
+            Parameter { name: "name"; type: "string" }
+            Parameter { name: "icon"; type: "string" }
+            Parameter { name: "rawTemplate"; type: "string" }
+            Parameter { name: "countObject"; type: "QObject"; isPointer: true }
+        }
+        Method {
+            name: "overrideCategoryJson"
+            type: "bool"
+            Parameter { name: "categoryId"; type: "string" }
+            Parameter { name: "json"; type: "string" }
+        }
+    }
+    Component {
+        name: "PreviewModel"
+        prototype: "unity::shell::scopes::PreviewModelInterface"
+        exports: ["Unity/FakePreviewModel 0.2"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "PreviewStack"
+        prototype: "unity::shell::scopes::PreviewStackInterface"
+        exports: ["Unity/PreviewStack 0.2"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "getPreviewModel"
+            type: "unity::shell::scopes::PreviewModelInterface*"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
+        name: "PreviewWidgetModel"
+        prototype: "unity::shell::scopes::PreviewWidgetModelInterface"
+        exports: ["Unity/PreviewWidgetModel 0.2"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "ResultsModel"
+        prototype: "unity::shell::scopes::ResultsModelInterface"
+        exports: ["Unity/ResultsModel 0.2"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "Scope"
+        prototype: "unity::shell::scopes::ScopeInterface"
+        exports: ["Unity/MockScope 0.2"]
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "setSearchInProgress"
+            Parameter { name: "inProg"; type: "bool" }
+        }
+        Method {
+            name: "activate"
+            Parameter { name: "result"; type: "QVariant" }
+        }
+        Method {
+            name: "preview"
+            type: "PreviewStack*"
+            Parameter { name: "result"; type: "QVariant" }
+        }
+        Method { name: "cancelActivation" }
+        Method {
+            name: "closeScope"
+            Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
+        }
+        Method {
+            name: "getDepartment"
+            type: "unity::shell::scopes::DepartmentInterface*"
+            Parameter { name: "id"; type: "string" }
+        }
+        Method {
+            name: "loadDepartment"
+            Parameter { name: "id"; type: "string" }
+        }
+    }
+    Component {
+        name: "Scopes"
+        prototype: "unity::shell::scopes::ScopesInterface"
+        exports: ["Unity/Scopes 0.2"]
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "rowCount"
+            type: "int"
+            Parameter { name: "parent"; type: "QModelIndex" }
+        }
+        Method { name: "rowCount"; type: "int" }
+        Method {
+            name: "getScope"
+            type: "unity::shell::scopes::ScopeInterface*"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "getScope"
+            type: "unity::shell::scopes::ScopeInterface*"
+            Parameter { name: "scope_id"; type: "string" }
+        }
+        Method {
+            name: "addScope"
+            Parameter { name: "scope"; type: "Scope"; isPointer: true }
+        }
+        Method { name: "clear" }
+        Method { name: "load" }
+    }
+    Component {
+        name: "unity::shell::scopes::CategoriesInterface"
+        prototype: "QAbstractListModel"
+        exports: ["Unity/Categories 0.2"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Roles"
+            values: {
+                "RoleCategoryId": 0,
+                "RoleName": 1,
+                "RoleIcon": 2,
+                "RoleRawRendererTemplate": 3,
+                "RoleRenderer": 4,
+                "RoleComponents": 5,
+                "RoleResults": 6,
+                "RoleCount": 7
+            }
+        }
+        Method {
+            name: "overrideCategoryJson"
+            type: "bool"
+            Parameter { name: "categoryId"; type: "string" }
+            Parameter { name: "json"; type: "string" }
+        }
+        Method {
+            name: "addSpecialCategory"
+            Parameter { name: "categoryId"; type: "string" }
+            Parameter { name: "name"; type: "string" }
+            Parameter { name: "icon"; type: "string" }
+            Parameter { name: "rawTemplate"; type: "string" }
+            Parameter { name: "countObject"; type: "QObject"; isPointer: true }
+        }
+    }
+    Component {
+        name: "unity::shell::scopes::DepartmentInterface"
+        prototype: "QAbstractListModel"
+        exports: ["Unity/Department 0.2"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Roles"
+            values: {
+                "RoleDepartmentId": 0,
+                "RoleLabel": 1,
+                "RoleHasChildren": 2,
+                "RoleIsActive": 3
+            }
+        }
+        Property { name: "departmentId"; type: "string"; isReadonly: true }
+        Property { name: "label"; type: "string"; isReadonly: true }
+        Property { name: "allLabel"; type: "string"; isReadonly: true }
+        Property { name: "parentDepartmentId"; type: "string"; isReadonly: true }
+        Property { name: "parentLabel"; type: "string"; isReadonly: true }
+        Property { name: "loaded"; type: "bool"; isReadonly: true }
+        Property { name: "isRoot"; type: "bool"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+    }
+    Component {
+        name: "unity::shell::scopes::PreviewModelInterface"
+        prototype: "QAbstractListModel"
+        Enum {
+            name: "Roles"
+            values: {
+                "RoleColumnModel": 0
+            }
+        }
+        Property { name: "widgetColumnCount"; type: "int" }
+        Property { name: "loaded"; type: "bool"; isReadonly: true }
+        Property { name: "processingAction"; type: "bool"; isReadonly: true }
+        Signal {
+            name: "triggered"
+            Parameter { type: "string" }
+            Parameter { type: "string" }
+            Parameter { type: "QVariantMap" }
+        }
+    }
+    Component {
+        name: "unity::shell::scopes::PreviewStackInterface"
+        prototype: "QAbstractListModel"
+        Enum {
+            name: "Roles"
+            values: {
+                "RolePreviewModel": 0
+            }
+        }
+        Property { name: "widgetColumnCount"; type: "int" }
+        Method {
+            name: "getPreviewModel"
+            type: "unity::shell::scopes::PreviewModelInterface*"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
+        name: "unity::shell::scopes::PreviewWidgetModelInterface"
+        prototype: "QAbstractListModel"
+        Enum {
+            name: "Roles"
+            values: {
+                "RoleWidgetId": 0,
+                "RoleType": 1,
+                "RoleProperties": 2
+            }
+        }
+    }
+    Component {
+        name: "unity::shell::scopes::ResultsModelInterface"
+        prototype: "QAbstractListModel"
+        Enum {
+            name: "Roles"
+            values: {
+                "RoleUri": 0,
+                "RoleCategoryId": 1,
+                "RoleDndUri": 2,
+                "RoleResult": 3,
+                "RoleTitle": 4,
+                "RoleArt": 5,
+                "RoleSubtitle": 6,
+                "RoleMascot": 7,
+                "RoleEmblem": 8,
+                "RoleSummary": 9,
+                "RoleAttributes": 10,
+                "RoleBackground": 11
+            }
+        }
+        Property { name: "categoryId"; type: "string" }
+        Property { name: "count"; type: "int"; isReadonly: true }
+    }
+    Component {
+        name: "unity::shell::scopes::ScopeInterface"
+        prototype: "QObject"
+        exports: ["Unity/Scope 0.2"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "id"; type: "string"; isReadonly: true }
+        Property { name: "name"; type: "string"; isReadonly: true }
+        Property { name: "iconHint"; type: "string"; isReadonly: true }
+        Property { name: "description"; type: "string"; isReadonly: true }
+        Property { name: "searchHint"; type: "string"; isReadonly: true }
+        Property { name: "searchInProgress"; type: "bool"; isReadonly: true }
+        Property { name: "visible"; type: "bool"; isReadonly: true }
+        Property { name: "shortcut"; type: "string"; isReadonly: true }
+        Property {
+            name: "categories"
+            type: "unity::shell::scopes::CategoriesInterface"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "searchQuery"; type: "string" }
+        Property { name: "noResultsHint"; type: "string" }
+        Property { name: "formFactor"; type: "string" }
+        Property { name: "isActive"; type: "bool" }
+        Property { name: "currentDepartmentId"; type: "string"; isReadonly: true }
+        Property { name: "hasDepartments"; type: "bool"; isReadonly: true }
+        Signal { name: "showDash" }
+        Signal { name: "hideDash" }
+        Signal {
+            name: "gotoUri"
+            Parameter { name: "uri"; type: "string" }
+        }
+        Signal {
+            name: "previewRequested"
+            Parameter { name: "result"; type: "QVariant" }
+        }
+        Signal {
+            name: "gotoScope"
+            Parameter { name: "scopeId"; type: "string" }
+        }
+        Signal {
+            name: "openScope"
+            Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
+        }
+        Signal {
+            name: "activateApplication"
+            Parameter { name: "desktop"; type: "string" }
+        }
+        Method {
+            name: "activate"
+            Parameter { name: "result"; type: "QVariant" }
+        }
+        Method {
+            name: "preview"
+            type: "unity::shell::scopes::PreviewStackInterface*"
+            Parameter { name: "result"; type: "QVariant" }
+        }
+        Method { name: "cancelActivation" }
+        Method {
+            name: "closeScope"
+            Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
+        }
+        Method {
+            name: "getDepartment"
+            type: "unity::shell::scopes::DepartmentInterface*"
+            Parameter { name: "departmentId"; type: "string" }
+        }
+        Method {
+            name: "loadDepartment"
+            Parameter { name: "departmentId"; type: "string" }
+        }
+    }
+    Component {
+        name: "unity::shell::scopes::ScopesInterface"
+        prototype: "QAbstractListModel"
+        Enum {
+            name: "Roles"
+            values: {
+                "RoleScope": 0,
+                "RoleId": 1,
+                "RoleVisible": 2,
+                "RoleTitle": 3
+            }
+        }
+        Property { name: "loaded"; type: "bool"; isReadonly: true }
+        Method {
+            name: "getScope"
+            type: "unity::shell::scopes::ScopeInterface*"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "getScope"
+            type: "unity::shell::scopes::ScopeInterface*"
+            Parameter { name: "scopeId"; type: "string" }
+        }
+    }
+}

=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-05-01 14:25:18 +0000
+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-06-26 10:07:27 +0000
@@ -18,15 +18,16 @@
 import QtTest 1.0
 import Unity.Test 0.1 as UT
 import QMenuModel 0.1
-import Unity.Indicators 0.1 as Indicators
 import Utils 0.1 as Utils
+import "../../../../qml/Panel/Indicators"
+
 
 Item {
     id: testView
     width: units.gu(40)
     height: units.gu(70)
 
-    Indicators.MenuItemFactory {
+    MenuItemFactory {
         id: factory
         menuModel: UnityMenuModel {}
     }

=== modified file 'tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2014-04-14 17:26:06 +0000
+++ tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2014-06-26 10:07:27 +0000
@@ -18,15 +18,15 @@
 import QtTest 1.0
 import Unity.Test 0.1 as UT
 import QMenuModel 0.1
-import Unity.Indicators 0.1 as Indicators
 import Utils 0.1 as Utils
+import "../../../../qml/Panel/Indicators"
 
 Item {
     id: testView
     width: units.gu(40)
     height: units.gu(70)
 
-    Indicators.MessageMenuItemFactory {
+    MessageMenuItemFactory {
         id: factory
         menuModel: UnityMenuModel {}
         menuIndex: 0

=== added file 'tests/utils/modules/Unity/Test/Test.qmltypes'
--- tests/utils/modules/Unity/Test/Test.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/utils/modules/Unity/Test/Test.qmltypes	2014-06-26 10:07:27 +0000
@@ -0,0 +1,59 @@
+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 Unity.Test 0.1 tests/utils/modules'
+
+Module {
+    Component {
+        name: "TestUtil"
+        prototype: "QObject"
+        exports: ["Unity.Test/Util 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "isInstanceOf"
+            type: "bool"
+            Parameter { type: "QObject"; isPointer: true }
+            Parameter { type: "string" }
+        }
+        Method { name: "touchEvent"; type: "TouchEventSequenceWrapper*" }
+    }
+    Component {
+        name: "TouchEventSequenceWrapper"
+        prototype: "QObject"
+        exports: ["Unity.Test/TouchEventSequence 0.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "commit"
+            Parameter { name: "processEvents"; type: "bool" }
+        }
+        Method { name: "commit" }
+        Method {
+            name: "move"
+            Parameter { name: "touchId"; type: "int" }
+            Parameter { name: "x"; type: "int" }
+            Parameter { name: "y"; type: "int" }
+        }
+        Method {
+            name: "press"
+            Parameter { name: "touchId"; type: "int" }
+            Parameter { name: "x"; type: "int" }
+            Parameter { name: "y"; type: "int" }
+        }
+        Method {
+            name: "release"
+            Parameter { name: "touchId"; type: "int" }
+            Parameter { name: "x"; type: "int" }
+            Parameter { name: "y"; type: "int" }
+        }
+        Method {
+            name: "stationary"
+            Parameter { name: "touchId"; type: "int" }
+        }
+    }
+}