Merge lp:~nick-dedekind/unity8/sharedunitymenumodel into lp:unity8

[Nick Dedekind]

remove qml ownership confusion for caching unitymenumodels

Changed to use QSharedPointers for unitymenumodel owenership.
Renamed CachedUnityMenuModel -> SharedUnityMenuModel

Uses new method for mocking Indicators & menu content.

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

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

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1265
http://jenkins.qa.ubuntu.com/job/unity8-ci/4293/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4768/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1387
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4537/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6020
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6020/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13122

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1266
http://jenkins.qa.ubuntu.com/job/unity8-ci/4296/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4778/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1297
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1390
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4545/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6030
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6030/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13128

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1266
http://jenkins.qa.ubuntu.com/job/unity8-ci/4302/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4790/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1396
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4556/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6042
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6042/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13145

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in plugins/Unity/Indicators/plugin.cpp
1 conflicts encountered.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1267
http://jenkins.qa.ubuntu.com/job/unity8-ci/4495/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5515/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1589
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1589
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5216/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6767
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6767/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14175

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1267
http://jenkins.qa.ubuntu.com/job/unity8-ci/4496/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5519
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1590
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1590
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6771
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6771/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14178

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1269
http://jenkins.qa.ubuntu.com/job/unity8-ci/4513/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1498
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1607
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1607
    None: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5269/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6827
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6827/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14244

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1273
http://jenkins.qa.ubuntu.com/job/unity8-ci/4517/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1611
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5275
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6835
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14252

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in tests/qmltests/CMakeLists.txt
Text conflict in tests/qmltests/tst_ShellWithPin.qml
2 conflicts encountered.

[Michael Terry (mterry)]

I looked at this briefly today. My comment from earlier still stands -- it's unsafe to assume Qml won't delete the singleton object you pass it. For example, if the Qml that loaded the plugin is destroyed, so will the plugin's objects.

Since you use ::singleton() calls elsewhere in code, you can't just give Qml a new object when it asks and outsource singleton-enforcement to Qml. But can you use a QPointer object as a return? I think it expects a QObject * pointer directly...

[Albert Astals Cid (aacid)]

if (keyVal.value().toStrongRef().isNull()) {

Can we just use

if (keyVal.value().isNull()) {

?

review: Needs Information

[Nick Dedekind (nick-dedekind)]

> if (keyVal.value().toStrongRef().isNull()) {
>
> Can we just use
>
> if (keyVal.value().isNull()) {
>
> ?

As far as I'm aware QWeakPointer::isNull only checks if the internal data is set, not if the shared data is still valid.

[Albert Astals Cid (aacid)]

> > if (keyVal.value().toStrongRef().isNull()) {
> >
> > Can we just use
> >
> > if (keyVal.value().isNull()) {
> >
> > ?
>
> As far as I'm aware QWeakPointer::isNull only checks if the internal data is
> set, not if the shared data is still valid.

The docu says

***
Returns true if this object is holding a reference to a null pointer.

Note that, due to the nature of weak references, the pointer that QWeakPointer references can become null at any moment, so the value returned from this function can change from false to true from one call to the next.
***

And the code does

***
return d == 0 || d->strongref.load() == 0 || value == 0;
***

So it seems to me it does work on the shared data too.

[Nick Dedekind (nick-dedekind)]

> I looked at this briefly today. My comment from earlier still stands -- it's
> unsafe to assume Qml won't delete the singleton object you pass it. For
> example, if the Qml that loaded the plugin is destroyed, so will the plugin's
> objects.
>
> Since you use ::singleton() calls elsewhere in code, you can't just give Qml a
> new object when it asks and outsource singleton-enforcement to Qml. But can
> you use a QPointer object as a return? I think it expects a QObject * pointer
> directly...

The only places that use the singleton are in the plugin, so I don't think plugin unloading is an issue? All the SharedUnityMenuModels will have been destroyed by then. I need to merge this with your greeter branch soon anyway, so i'm guessing the shared models will be parented to the cache anyway...

Might be able to use QPointer as the static and give Qml the raw one...

[Albert Astals Cid (aacid)]

> > I looked at this briefly today. My comment from earlier still stands --
> it's
> > unsafe to assume Qml won't delete the singleton object you pass it. For
> > example, if the Qml that loaded the plugin is destroyed, so will the
> plugin's
> > objects.
> >
> > Since you use ::singleton() calls elsewhere in code, you can't just give Qml
> a
> > new object when it asks and outsource singleton-enforcement to Qml. But can
> > you use a QPointer object as a return? I think it expects a QObject *
> pointer
> > directly...
>
> The only places that use the singleton are in the plugin, so I don't think
> plugin unloading is an issue? All the SharedUnityMenuModels will have been
> destroyed by then. I need to merge this with your greeter branch soon anyway,
> so i'm guessing the shared models will be parented to the cache anyway...

Exactly what I was going to say, you can't call the function that uses the singleton without the plugin so i don't think this is a problem either.

[Albert Astals Cid (aacid)]

Shall we add a break inside the if in
  connect(model, &QObject::destroyed, this, [this] {
?

As far as i understand the code once it this delete has found a value that is null there should not be any other since every delete clears it's own "null", no?

review: Needs Information

[Nick Dedekind (nick-dedekind)]

> > > if (keyVal.value().toStrongRef().isNull()) {
> > >
> > > Can we just use
> > >
> > > if (keyVal.value().isNull()) {
> > >
> > > ?
> >
> > As far as I'm aware QWeakPointer::isNull only checks if the internal data is
> > set, not if the shared data is still valid.
>
> The docu says
>
> ***
> Returns true if this object is holding a reference to a null pointer.
>
> Note that, due to the nature of weak references, the pointer that QWeakPointer
> references can become null at any moment, so the value returned from this
> function can change from false to true from one call to the next.
> ***
>
> And the code does
>
> ***
> return d == 0 || d->strongref.load() == 0 || value == 0;
> ***
>
> So it seems to me it does work on the shared data too.

My bad. I hate inline code; was looking at the shared pointer impl for isNull...
Fixed.

[Nick Dedekind (nick-dedekind)]

> Shall we add a break inside the if in
> connect(model, &QObject::destroyed, this, [this] {
> ?
>
> As far as i understand the code once it this delete has found a value that is
> null there should not be any other since every delete clears it's own "null",
> no?

Yep.
Fixed.

[Albert Astals Cid (aacid)]

Code looks good to me, and i've played with it in the phone and have not been able to find anything wrong with it either.

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
Waiting before top approval

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1274
http://jenkins.qa.ubuntu.com/job/unity8-ci/4624/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5864
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1610
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1718
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7116
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14583

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

CI doesn't seem more broken than on other runs, top approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1276
http://jenkins.qa.ubuntu.com/job/unity8-ci/4626/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5869
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1720
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5517
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7121
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14590

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in tests/qmltests/tst_ShellWithPin.qml
1 conflicts encountered.

review: Needs Fixing

[lp:~nick-dedekind/unity8/sharedunitymenumodel]

1277. By Nick Dedekind on 2014-10-14

merged with trunk

[Nick Dedekind (nick-dedekind)]

> Text conflict in tests/qmltests/tst_ShellWithPin.qml
> 1 conflicts encountered.

Fixed.

[Albert Astals Cid (aacid)]

Ok, let's wait for CI run again

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1277
http://jenkins.qa.ubuntu.com/job/unity8-ci/4644/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5910
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1738
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7162
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14636

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

> The only places that use the singleton are in the plugin, so I don't think plugin unloading is an issue?

But the Qml that loaded the plugin could be destroyed and created again, eh? The second time the plugin is loaded, it will hand back an invalid pointer. Stuff like that happens with loaders that contain plugin imports.

I had to fix a crasher in the wizard a while back due to a similar issue is all, that's why I'm sensitive to it. :) The wizard drops references to pages as you press 'back' so it's more likely to hit the issue. But even if we don't hit the issue now in unity8, it's a hidden gotcha waiting to crash us.

[Albert Astals Cid (aacid)]

I am not still sure i totally understand how this can happen but then maybe we can turn

  UnityMenuModelCache* UnityMenuModelCache::theCache = nullptr;

into
  QPointer<UnityMenuModelCache> UnityMenuModelCache::theCache;

and rely on QPointer magic set to 0 when QObjects are destroyed?

[Michael Terry (mterry)]

This is how it might happen:

====

main.qml:

Loader {
 source: loadit ? "test.qml" : ""
}

test.qml:

import Unity.Indicators 0.1

====

As test.qml is loaded/unloaded, if it was the only reference to that plugin, Qml would destroy/create the plugin too.

The first time it destroyed the plugin, it would call 'delete' on the singletons the plugin made. Which would leave theCache pointer dangling. So the next time the plugin is loaded, it will pass the Qml a dangling pointer.

[Michael Terry (mterry)]

One easy fix for this is a destructor for the class that if (this == theCache) { theCache = nullptr; }

[lp:~nick-dedekind/unity8/sharedunitymenumodel]

1278. By Nick Dedekind on 2014-10-14

use QPointer to track singleton destruction

[Nick Dedekind (nick-dedekind)]

> One easy fix for this is a destructor for the class that if (this == theCache)
> { theCache = nullptr; }

went with the QPointer in the end. Gives better encapsulation of the singleton pattern.

[Albert Astals Cid (aacid)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1278
http://jenkins.qa.ubuntu.com/job/unity8-ci/4651/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5926
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1747
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1745
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7178
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14659

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1278
http://jenkins.qa.ubuntu.com/job/unity8-ci/4683/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6037
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1777
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7289
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14839

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/AccountsService/AccountsService.qmltypes'
--- plugins/AccountsService/AccountsService.qmltypes	2014-09-01 12:18:53 +0000
+++ plugins/AccountsService/AccountsService.qmltypes	2014-10-14 14:19:22 +0000
@@ -23,6 +23,8 @@
         }
         Property { name: "user"; type: "string" }
         Property { name: "demoEdges"; type: "bool" }
+        Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
+        Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
         Property { name: "backgroundFile"; type: "string"; isReadonly: true }
         Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
         Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

=== modified file 'plugins/Dash/Dash.qmltypes'
--- plugins/Dash/Dash.qmltypes	2014-08-14 01:28:06 +0000
+++ plugins/Dash/Dash.qmltypes	2014-10-14 14:19:22 +0000
@@ -40,9 +40,12 @@
         Property { name: "forceNoClip"; type: "bool" }
         Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }
         Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }
+        Property { name: "cacheBuffer"; type: "double" }
         Signal { name: "headerChanged" }
         Method { name: "positionAtBeginning" }
         Method { name: "showHeader" }
+        Method { name: "firstCreatedIndex"; type: "int" }
+        Method { name: "createdItemCount"; type: "int" }
         Method {
             name: "item"
             type: "QQuickItem*"

=== modified file 'plugins/LightDM/LightDM.qmltypes'
--- plugins/LightDM/LightDM.qmltypes	2014-09-01 12:18:53 +0000
+++ plugins/LightDM/LightDM.qmltypes	2014-10-14 14:19:22 +0000
@@ -37,6 +37,7 @@
         Signal { name: "isActiveChanged" }
         Signal { name: "isAuthenticatedChanged" }
         Signal { name: "showGreeter" }
+        Signal { name: "hideGreeter" }
         Signal {
             name: "requestAuthenticationUser"
             Parameter { name: "user"; type: "string" }

=== modified file 'plugins/Ubuntu/Payments/Payments.qmltypes'
--- plugins/Ubuntu/Payments/Payments.qmltypes	2014-06-27 20:53:24 +0000
+++ plugins/Ubuntu/Payments/Payments.qmltypes	2014-10-14 14:19:22 +0000
@@ -37,6 +37,7 @@
             Parameter { name: "error"; type: "string" }
         }
         Signal { name: "purchaseCompleted" }
+        Signal { name: "purchaseCancelled" }
         Method { name: "start" }
     }
 }

=== modified file 'plugins/Unity/DashCommunicator/DashCommunicator.qmltypes'
--- plugins/Unity/DashCommunicator/DashCommunicator.qmltypes	2014-08-14 13:33:28 +0000
+++ plugins/Unity/DashCommunicator/DashCommunicator.qmltypes	2014-10-14 14:19:22 +0000
@@ -9,14 +9,14 @@
 Module {
     Component {
         name: "DashCommunicator"
-        prototype: "QObject"
+        prototype: "QThread"
         exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]
         exportMetaObjectRevisions: [0]
         Method {
             name: "setCurrentScope"
             Parameter { name: "scopeId"; type: "string" }
             Parameter { name: "animate"; type: "bool" }
-            Parameter { name: "reset"; type: "bool" }
+            Parameter { name: "isSwipe"; type: "bool" }
         }
     }
     Component {
@@ -28,7 +28,20 @@
             name: "setCurrentScopeRequested"
             Parameter { name: "scopeId"; type: "string" }
             Parameter { name: "animate"; type: "bool" }
-            Parameter { name: "reset"; type: "bool" }
-        }
+            Parameter { name: "isSwipe"; type: "bool" }
+        }
+    }
+    Component {
+        name: "QThread"
+        prototype: "QObject"
+        Signal { name: "started" }
+        Signal { name: "finished" }
+        Method {
+            name: "start"
+            Parameter { type: "Priority" }
+        }
+        Method { name: "start" }
+        Method { name: "terminate" }
+        Method { name: "quit" }
     }
 }

=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
--- plugins/Unity/Indicators/CMakeLists.txt	2014-07-30 16:00:55 +0000
+++ plugins/Unity/Indicators/CMakeLists.txt	2014-10-14 14:19:22 +0000
@@ -24,6 +24,7 @@
     modelprinter.cpp
     plugin.cpp
     rootactionstate.cpp
+    sharedunitymenumodel.cpp
     unitymenumodelcache.cpp
     unitymenumodelstack.cpp
     visibleindicatorsmodel.cpp

=== modified file 'plugins/Unity/Indicators/Indicators.qmltypes'
--- plugins/Unity/Indicators/Indicators.qmltypes	2014-09-01 12:18:53 +0000
+++ plugins/Unity/Indicators/Indicators.qmltypes	2014-10-14 14:19:22 +0000
@@ -210,6 +210,16 @@
         Signal { name: "indexChanged" }
     }
     Component {
+        name: "SharedUnityMenuModel"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/SharedUnityMenuModel 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "busName"; type: "QByteArray" }
+        Property { name: "menuObjectPath"; type: "QByteArray" }
+        Property { name: "actions"; type: "QVariantMap" }
+        Property { name: "model"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }
+    }
+    Component {
         name: "UnityMenuModelCache"
         prototype: "QObject"
         exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]
@@ -217,13 +227,6 @@
         isSingleton: true
         exportMetaObjectRevisions: [0]
         Method {
-            name: "model"
-            type: "UnityMenuModel*"
-            Parameter { name: "bus"; type: "QByteArray" }
-            Parameter { name: "path"; type: "QByteArray" }
-            Parameter { name: "actions"; type: "QVariantMap" }
-        }
-        Method {
             name: "contains"
             type: "bool"
             Parameter { name: "path"; type: "QByteArray" }

=== modified file 'plugins/Unity/Indicators/plugin.cpp'
--- plugins/Unity/Indicators/plugin.cpp	2014-07-30 16:00:55 +0000
+++ plugins/Unity/Indicators/plugin.cpp	2014-10-14 14:19:22 +0000
@@ -30,18 +30,23 @@
 #include "menucontentactivator.h"
 #include "modelprinter.h"
 #include "rootactionstate.h"
+#include "sharedunitymenumodel.h"
 #include "unitymenumodelcache.h"
 #include "unitymenumodelstack.h"
 #include "visibleindicatorsmodel.h"
 
+#include <unitymenumodel.h>
+
 static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
   Q_UNUSED(engine);
   Q_UNUSED(scriptEngine);
-  return new UnityMenuModelCache;
+  return UnityMenuModelCache::singleton();
 }
 
-void Indicators2Plugin::registerTypes(const char *uri)
+void IndicatorsPlugin::registerTypes(const char *uri)
 {
+    qRegisterMetaType<UnityMenuModel*>("UnityMenuModel*");
+
     qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");
     qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
     qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
@@ -49,6 +54,7 @@
     qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");
     qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
     qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
+    qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");
 
     qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
 

=== modified file 'plugins/Unity/Indicators/plugin.h'
--- plugins/Unity/Indicators/plugin.h	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/plugin.h	2014-10-14 14:19:22 +0000
@@ -22,7 +22,7 @@
 
 #include <QtQml/QQmlExtensionPlugin>
 
-class Indicators2Plugin : public QQmlExtensionPlugin
+class IndicatorsPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

=== added file 'plugins/Unity/Indicators/sharedunitymenumodel.cpp'
--- plugins/Unity/Indicators/sharedunitymenumodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/sharedunitymenumodel.cpp	2014-10-14 14:19:22 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2014 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/>.
+ *
+ */
+
+#include "sharedunitymenumodel.h"
+#include "unitymenumodelcache.h"
+
+SharedUnityMenuModel::SharedUnityMenuModel(QObject* parent)
+    : QObject(parent)
+{
+}
+
+QByteArray SharedUnityMenuModel::busName() const
+{
+    return m_busName;
+}
+
+void SharedUnityMenuModel::setBusName(const QByteArray& busName)
+{
+    if (m_busName != busName) {
+        m_busName = busName;
+        Q_EMIT busNameChanged();
+        initialize();
+    }
+}
+
+QByteArray SharedUnityMenuModel::menuObjectPath() const
+{
+    return m_menuObjectPath;
+}
+
+void SharedUnityMenuModel::setMenuObjectPath(const QByteArray& menuObjectPath)
+{
+    if (m_menuObjectPath != menuObjectPath) {
+        m_menuObjectPath = menuObjectPath;
+        Q_EMIT menuObjectPathChanged();
+        initialize();
+    }
+}
+
+QVariantMap SharedUnityMenuModel::actions() const
+{
+    return m_actions;
+}
+
+void SharedUnityMenuModel::setActions(const QVariantMap& actions)
+{
+    if (m_actions != actions) {
+        m_actions = actions;
+        Q_EMIT actionsChanged();
+        initialize();
+    }
+}
+
+UnityMenuModel* SharedUnityMenuModel::model() const
+{
+    return m_model ? m_model.data() : nullptr;
+}
+
+void SharedUnityMenuModel::initialize()
+{
+    if (m_busName.isEmpty() || m_menuObjectPath.isEmpty() || m_actions.isEmpty()) {
+        if (!m_model.isNull()) {
+            m_model.clear();
+            Q_EMIT modelChanged();
+        }
+    } else {
+        QSharedPointer<UnityMenuModel> model = UnityMenuModelCache::singleton()->model(m_busName, m_menuObjectPath, m_actions);
+        if (model != m_model) {
+            m_model = model;
+            Q_EMIT modelChanged();
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/sharedunitymenumodel.h'
--- plugins/Unity/Indicators/sharedunitymenumodel.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/sharedunitymenumodel.h	2014-10-14 14:19:22 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2014 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/>.
+ *
+ */
+
+#ifndef SHAREDUNITYMENUMODEL_H
+#define SHAREDUNITYMENUMODEL_H
+
+#include "unityindicatorsglobal.h"
+
+#include <QObject>
+#include <QSharedPointer>
+#include <QVariantMap>
+
+class UnityMenuModel;
+
+class UNITYINDICATORS_EXPORT SharedUnityMenuModel : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged)
+    Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged)
+    Q_PROPERTY(QVariantMap actions READ actions WRITE setActions NOTIFY actionsChanged)
+    Q_PROPERTY(UnityMenuModel* model READ model NOTIFY modelChanged)
+
+public:
+    SharedUnityMenuModel(QObject* parent = nullptr);
+
+    QByteArray busName() const;
+    void setBusName(const QByteArray&);
+
+    QByteArray menuObjectPath() const;
+    void setMenuObjectPath(const QByteArray&);
+
+    QVariantMap actions() const;
+    void setActions(const QVariantMap&);
+
+    UnityMenuModel* model() const;
+
+Q_SIGNALS:
+    void busNameChanged();
+    void menuObjectPathChanged();
+    void actionsChanged();
+    void modelChanged();
+
+private:
+    void initialize();
+
+    QByteArray m_busName;
+    QByteArray m_menuObjectPath;
+    QVariantMap m_actions;
+    QSharedPointer<UnityMenuModel> m_model;
+};
+
+#endif // SHAREDUNITYMENUMODEL_H

=== modified file 'plugins/Unity/Indicators/unitymenumodelcache.cpp'
--- plugins/Unity/Indicators/unitymenumodelcache.cpp	2014-08-20 09:16:28 +0000
+++ plugins/Unity/Indicators/unitymenumodelcache.cpp	2014-10-14 14:19:22 +0000
@@ -20,30 +20,45 @@
 #include "unitymenumodelcache.h"
 #include <unitymenumodel.h>
 
+#include <QQmlEngine>
+
+QPointer<UnityMenuModelCache> UnityMenuModelCache::theCache = nullptr;
+
+UnityMenuModelCache* UnityMenuModelCache::singleton()
+{
+    if (theCache.isNull()) {
+        theCache = new UnityMenuModelCache();
+    }
+    return theCache.data();
+}
+
 UnityMenuModelCache::UnityMenuModelCache(QObject* parent)
     : QObject(parent)
 {
 }
 
-UnityMenuModelCache::~UnityMenuModelCache()
-{
-}
-
-UnityMenuModel* UnityMenuModelCache::model(const QByteArray& bus,
-                                           const QByteArray& path,
-                                           const QVariantMap& actions)
+QSharedPointer<UnityMenuModel> UnityMenuModelCache::model(const QByteArray& bus,
+                                                          const QByteArray& path,
+                                                          const QVariantMap& actions)
 {
     if (m_registry.contains(path))
         return m_registry[path];
 
-    UnityMenuModel* menuModel = new UnityMenuModel;
-    connect(menuModel, &QObject::destroyed, this, [menuModel, this](QObject*) {
-        QList<QByteArray> keys = m_registry.keys(menuModel);
-        Q_FOREACH(const QByteArray& key, keys) {
-            m_registry.remove(key);
+    UnityMenuModel* model = new UnityMenuModel;
+    QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership);
+
+    QSharedPointer<UnityMenuModel> menuModel(model);
+    connect(model, &QObject::destroyed, this, [this] {
+        QMutableHashIterator<QByteArray, QWeakPointer<UnityMenuModel>> iter(m_registry);
+        while(iter.hasNext()) {
+            auto keyVal = iter.next();
+            if (keyVal.value().isNull()) {
+                iter.remove();
+                break;
+            }
         }
     });
-    m_registry[path] = menuModel;
+    m_registry[path] = menuModel.toWeakRef();
 
     menuModel->setBusName(bus);
     menuModel->setMenuObjectPath(path);

=== modified file 'plugins/Unity/Indicators/unitymenumodelcache.h'
--- plugins/Unity/Indicators/unitymenumodelcache.h	2014-08-26 08:14:44 +0000
+++ plugins/Unity/Indicators/unitymenumodelcache.h	2014-10-14 14:19:22 +0000
@@ -24,6 +24,8 @@
 
 #include <QObject>
 #include <QHash>
+#include <QPointer>
+#include <QWeakPointer>
 
 class UnityMenuModel;
 
@@ -32,15 +34,19 @@
     Q_OBJECT
 public:
     UnityMenuModelCache(QObject*parent=nullptr);
-    ~UnityMenuModelCache();
-
-    Q_INVOKABLE UnityMenuModel* model(const QByteArray& bus,
-                                      const QByteArray& path,
-                                      const QVariantMap& actions);
-    Q_INVOKABLE bool contains(const QByteArray& path);
-
-private:
-    QHash<QByteArray, UnityMenuModel*> m_registry;
+
+    static UnityMenuModelCache* singleton();
+
+    virtual QSharedPointer<UnityMenuModel> model(const QByteArray& bus,
+                                         const QByteArray& path,
+                                         const QVariantMap& actions);
+
+    // for tests use
+    Q_INVOKABLE virtual bool contains(const QByteArray& path);
+
+protected:
+    QHash<QByteArray, QWeakPointer<UnityMenuModel>> m_registry;
+    static QPointer<UnityMenuModelCache> theCache;
 };
 
 #endif // UNITYMENUMODELCACHE_H

=== modified file 'plugins/Unity/Launcher/Launcher.qmltypes'
--- plugins/Unity/Launcher/Launcher.qmltypes	2014-06-26 07:47:57 +0000
+++ plugins/Unity/Launcher/Launcher.qmltypes	2014-10-14 14:19:22 +0000
@@ -13,14 +13,6 @@
         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"
@@ -30,6 +22,10 @@
         isSingleton: true
         exportMetaObjectRevisions: [0]
         Method {
+            name: "requestRemove"
+            Parameter { name: "appId"; type: "string" }
+        }
+        Method {
             name: "get"
             type: "unity::shell::launcher::LauncherItemInterface*"
             Parameter { name: "index"; type: "int" }
@@ -49,10 +45,6 @@
             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" }
@@ -88,6 +80,7 @@
         Property { name: "recent"; type: "bool"; isReadonly: true }
         Property { name: "progress"; type: "int"; isReadonly: true }
         Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "countVisible"; type: "bool"; isReadonly: true }
         Property { name: "focused"; type: "bool"; isReadonly: true }
         Property {
             name: "quickList"
@@ -96,6 +89,14 @@
             isPointer: true
         }
         Signal {
+            name: "nameChanged"
+            Parameter { name: "name"; type: "string" }
+        }
+        Signal {
+            name: "iconChanged"
+            Parameter { name: "icon"; type: "string" }
+        }
+        Signal {
             name: "pinnedChanged"
             Parameter { name: "pinned"; type: "bool" }
         }
@@ -116,6 +117,10 @@
             Parameter { name: "count"; type: "int" }
         }
         Signal {
+            name: "countVisibleChanged"
+            Parameter { name: "countVisible"; type: "bool" }
+        }
+        Signal {
             name: "focusedChanged"
             Parameter { name: "focused"; type: "bool" }
         }

=== modified file 'plugins/Unity/Session/Session.qmltypes'
--- plugins/Unity/Session/Session.qmltypes	2014-08-14 01:28:06 +0000
+++ plugins/Unity/Session/Session.qmltypes	2014-10-14 14:19:22 +0000
@@ -34,4 +34,14 @@
         Method { name: "RequestReboot" }
         Method { name: "RequestShutdown" }
     }
+    Component {
+        name: "OrientationLock"
+        prototype: "QObject"
+        exports: ["Unity.Session/OrientationLock 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "enabled"; type: "bool"; isReadonly: true }
+        Property { name: "savedOrientation"; type: "Qt::ScreenOrientation" }
+    }
 }

=== modified file 'plugins/Utils/Utils.qmltypes'
--- plugins/Utils/Utils.qmltypes	2014-08-14 01:28:06 +0000
+++ plugins/Utils/Utils.qmltypes	2014-10-14 14:19:22 +0000
@@ -107,6 +107,12 @@
         }
     }
     Component {
+        name: "RelativeTimeFormatter"
+        prototype: "TimeFormatter"
+        exports: ["Utils/RelativeTimeFormatter 0.1"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "TimeFormatter"
         prototype: "QObject"
         exports: ["Utils/GDateTimeFormatter 0.1", "Utils/TimeFormatter 0.1"]

=== modified file 'qml/Greeter/Clock.qml'
--- qml/Greeter/Clock.qml	2014-08-20 08:39:09 +0000
+++ qml/Greeter/Clock.qml	2014-10-14 14:19:22 +0000
@@ -34,21 +34,21 @@
         }
     }
 
-    CachedUnityMenuModel {
+    Indicators.SharedUnityMenuModel {
         id: timeModel
         objectName: "timeModel"
 
         busName: "com.canonical.indicator.datetime"
-        actionsObjectPath: "/com/canonical/indicator/datetime"
+        actions: { "indicator": "/com/canonical/indicator/datetime" }
         menuObjectPath: clock.visible ? "/com/canonical/indicator/datetime/phone" : ""
+    }
 
-        Indicators.RootActionState {
-            menu: timeModel.model
-            onUpdated: {
-                if (timeLabel.text != rightLabel) {
-                    timeLabel.text = rightLabel;
-                    clock.currentDate = new Date();
-                }
+    Indicators.RootActionState {
+        menu: timeModel.model
+        onUpdated: {
+            if (timeLabel.text != rightLabel) {
+                if (rightLabel != "") timeLabel.text = rightLabel;
+                clock.currentDate = new Date();
             }
         }
     }

=== removed file 'qml/Panel/Indicators/CachedUnityMenuModel.qml'
--- qml/Panel/Indicators/CachedUnityMenuModel.qml	2014-08-20 08:39:09 +0000
+++ qml/Panel/Indicators/CachedUnityMenuModel.qml	1970-01-01 00:00:00 +0000
@@ -1,39 +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 QMenuModel 0.1
-import Unity.Indicators 0.1 as Indicators
-
-// Make sure we don't duplicate models.
-Item {
-    id: cachedModel
-    property string busName
-    property string actionsObjectPath
-    property string menuObjectPath
-    readonly property bool ready: busName!=="" && actionsObjectPath!=="" && menuObjectPath!==""
-
-    property var model: {
-        if (!ready) return null;
-
-        return Indicators.UnityMenuModelCache.model(cachedModel.busName,
-                                                    cachedModel.menuObjectPath,
-                                                    { "indicator": cachedModel.actionsObjectPath });
-    }
-}

=== modified file 'qml/Panel/Indicators/IndicatorBase.qml'
--- qml/Panel/Indicators/IndicatorBase.qml	2014-09-29 10:24:58 +0000
+++ qml/Panel/Indicators/IndicatorBase.qml	2014-10-14 14:19:22 +0000
@@ -37,10 +37,10 @@
     property alias menuModel: cachedModel.model
     property alias rootActionState: rootAction
 
-    CachedUnityMenuModel {
+    SharedUnityMenuModel {
         id: cachedModel
         busName: indicatorItem.busName
-        actionsObjectPath: indicatorItem.actionsObjectPath
+        actions: { "indicator": indicatorItem.actionsObjectPath }
         menuObjectPath: indicatorItem.deviceMenuObjectPath
     }
 

=== modified file 'tests/mocks/AccountsService/AccountsService.qmltypes'
--- tests/mocks/AccountsService/AccountsService.qmltypes	2014-09-01 12:18:53 +0000
+++ tests/mocks/AccountsService/AccountsService.qmltypes	2014-10-14 14:19:22 +0000
@@ -23,6 +23,8 @@
         }
         Property { name: "user"; type: "string" }
         Property { name: "demoEdges"; type: "bool" }
+        Property { name: "enableLauncherWhileLocked"; type: "bool" }
+        Property { name: "enableIndicatorsWhileLocked"; type: "bool" }
         Property { name: "backgroundFile"; type: "string" }
         Property { name: "statsWelcomeScreen"; type: "bool" }
         Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

=== modified file 'tests/mocks/LightDM/LightDM.qmltypes'
--- tests/mocks/LightDM/LightDM.qmltypes	2014-09-01 12:18:53 +0000
+++ tests/mocks/LightDM/LightDM.qmltypes	2014-10-14 14:19:22 +0000
@@ -37,6 +37,7 @@
         Signal { name: "isActiveChanged" }
         Signal { name: "isAuthenticatedChanged" }
         Signal { name: "showGreeter" }
+        Signal { name: "hideGreeter" }
         Signal {
             name: "requestAuthenticationUser"
             Parameter { name: "user"; type: "string" }

=== modified file 'tests/mocks/QMenuModel/QMenuModel.qmltypes'
--- tests/mocks/QMenuModel/QMenuModel.qmltypes	2014-08-14 01:28:06 +0000
+++ tests/mocks/QMenuModel/QMenuModel.qmltypes	2014-10-14 14:19:22 +0000
@@ -18,12 +18,12 @@
         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 }
         Property { name: "nameOwner"; type: "string"; isReadonly: true }
+        Property { name: "modelData"; type: "QVariant" }
         Method {
             name: "insertRow"
             Parameter { name: "row"; type: "int" }

=== modified file 'tests/mocks/QMenuModel/unitymenumodel.cpp'
--- tests/mocks/QMenuModel/unitymenumodel.cpp	2014-08-26 08:14:44 +0000
+++ tests/mocks/QMenuModel/unitymenumodel.cpp	2014-10-14 14:19:22 +0000
@@ -50,13 +50,12 @@
 {
     beginResetModel();
 
-    m_modelData.clear();
     m_modelData = data.toList();
+    Q_EMIT modelDataChanged();
 
     endResetModel();
 }
 
-
 void UnityMenuModel::insertRow(int row, const QVariant& data)
 {
     row = qMin(row, rowCount());

=== modified file 'tests/mocks/QMenuModel/unitymenumodel.h'
--- tests/mocks/QMenuModel/unitymenumodel.h	2014-08-26 08:14:44 +0000
+++ tests/mocks/QMenuModel/unitymenumodel.h	2014-10-14 14:19:22 +0000
@@ -27,13 +27,15 @@
 class Q_DECL_EXPORT UnityMenuModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged)
     Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged)
     Q_PROPERTY(QVariantMap actions READ actions WRITE setActions NOTIFY actionsChanged)
     Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged)
     Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged)
     Q_PROPERTY(QString nameOwner READ nameOwner NOTIFY nameOwnerChanged)
 
+    // internal mock properties
+    Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged)
+
 public:
     UnityMenuModel(QObject *parent = nullptr);
     virtual ~UnityMenuModel();
@@ -81,8 +83,10 @@
     void actionsChanged();
     void menuObjectPathChanged();
     void actionStateParserChanged();
+    void nameOwnerChanged();
+
+    // Internal mock usage
     void modelDataChanged();
-    void nameOwnerChanged();
 
 private:
     QVariantMap rowData(int row) const;

=== modified file 'tests/mocks/Ubuntu/Payments/Payments.qmltypes'
--- tests/mocks/Ubuntu/Payments/Payments.qmltypes	2014-06-27 20:53:24 +0000
+++ tests/mocks/Ubuntu/Payments/Payments.qmltypes	2014-10-14 14:19:22 +0000
@@ -37,6 +37,8 @@
             Parameter { name: "error"; type: "string" }
         }
         Signal { name: "purchaseCompleted" }
+        Signal { name: "purchaseCancelled" }
         Method { name: "start" }
+        Method { name: "process" }
     }
 }

=== modified file 'tests/mocks/Ubuntu/Telephony/Telephony.qmltypes'
--- tests/mocks/Ubuntu/Telephony/Telephony.qmltypes	2014-08-14 13:33:28 +0000
+++ tests/mocks/Ubuntu/Telephony/Telephony.qmltypes	2014-10-14 14:19:22 +0000
@@ -22,7 +22,8 @@
         exportMetaObjectRevisions: [0]
         Property { name: "phoneNumber"; type: "string" }
         Property { name: "isConference"; type: "bool" }
-        Property { name: "elapsedTime"; type: "int"; isReadonly: true }
+        Property { name: "elapsedTime"; type: "int" }
+        Property { name: "elapsedTimerRunning"; type: "bool" }
     }
     Component {
         name: "MockCallManager"

=== modified file 'tests/mocks/Unity/Application/Application.qmltypes'
--- tests/mocks/Unity/Application/Application.qmltypes	2014-09-01 12:24:06 +0000
+++ tests/mocks/Unity/Application/Application.qmltypes	2014-10-14 14:19:22 +0000
@@ -238,6 +238,7 @@
         Property { name: "state"; type: "State"; isReadonly: true }
         Property { name: "name"; type: "string"; isReadonly: true }
         Property { name: "live"; type: "bool"; isReadonly: true }
+        Property { name: "orientation"; type: "Qt::ScreenOrientation" }
         Signal {
             name: "typeChanged"
             Parameter { type: "Type" }
@@ -268,10 +269,15 @@
         exportMetaObjectRevisions: [0]
         Property { name: "name"; type: "string"; isReadonly: true }
         Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }
+        Property { name: "application"; type: "ApplicationInfo"; isReadonly: true; isPointer: true }
         Property { name: "parentSession"; type: "Session"; isReadonly: true; isPointer: true }
         Property { name: "childSessions"; type: "SessionModel"; isReadonly: true; isPointer: true }
         Property { name: "live"; type: "bool"; isReadonly: true }
         Signal {
+            name: "applicationChanged"
+            Parameter { type: "ApplicationInfo"; isPointer: true }
+        }
+        Signal {
             name: "surfaceChanged"
             Parameter { type: "MirSurfaceItem"; isPointer: true }
         }
@@ -368,6 +374,12 @@
         Property { name: "stage"; type: "Stage"; isReadonly: true }
         Property { name: "state"; type: "State"; isReadonly: true }
         Property { name: "focused"; type: "bool"; isReadonly: true }
+        Property { name: "splashTitle"; type: "string"; isReadonly: true }
+        Property { name: "splashImage"; type: "QUrl"; isReadonly: true }
+        Property { name: "splashShowHeader"; type: "bool"; isReadonly: true }
+        Property { name: "splashColor"; type: "QColor"; isReadonly: true }
+        Property { name: "splashColorHeader"; type: "QColor"; isReadonly: true }
+        Property { name: "splashColorFooter"; type: "QColor"; isReadonly: true }
         Signal {
             name: "nameChanged"
             Parameter { name: "name"; type: "string" }
@@ -414,6 +426,7 @@
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "focusedApplicationId"; type: "string"; isReadonly: true }
         Property { name: "suspended"; type: "bool" }
+        Property { name: "forceDashActive"; type: "bool" }
         Signal {
             name: "focusRequested"
             Parameter { name: "appId"; type: "string" }

=== modified file 'tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes'
--- tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes	2014-08-14 13:33:28 +0000
+++ tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes	2014-10-14 14:19:22 +0000
@@ -34,13 +34,13 @@
             name: "setCurrentScopeRequested"
             Parameter { name: "scopeId"; type: "string" }
             Parameter { name: "animate"; type: "bool" }
-            Parameter { name: "reset"; type: "bool" }
+            Parameter { name: "isSwipe"; type: "bool" }
         }
         Method {
             name: "mockSetCurrentScope"
             Parameter { name: "scopeId"; type: "string" }
             Parameter { name: "animate"; type: "bool" }
-            Parameter { name: "reset"; type: "bool" }
+            Parameter { name: "isSwipe"; type: "bool" }
         }
     }
 }

=== modified file 'tests/mocks/Unity/Indicators/CMakeLists.txt'
--- tests/mocks/Unity/Indicators/CMakeLists.txt	2014-08-20 08:39:09 +0000
+++ tests/mocks/Unity/Indicators/CMakeLists.txt	2014-10-14 14:19:22 +0000
@@ -12,24 +12,17 @@
 
 set(IndicatorsFakeQml_SOURCES
     fakeplugin.cpp
+    fakeindicatorsmodel.cpp
+    fakeunitymenumodelcache.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/sharedunitymenumodel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelcache.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp
-    fakeindicatorsmodel.cpp
-)
-
-set(IndicatorsFakeQml_RESOURCES
-    indicators_fake.qrc
-)
-
-qt5_add_resources(IndicatorsFakeQml_RESOURCES_RCC
-    ${IndicatorsFakeQml_RESOURCES}
 )
 
 add_library(IndicatorsFakeQml SHARED
-    ${IndicatorsFakeQml_RESOURCES_RCC}
     ${IndicatorsFakeQml_SOURCES}
 )
 add_definitions(-DUNITYINDICATORS_LIBRARY)

=== removed file 'tests/mocks/Unity/Indicators/FakeMenuPage.qml'
--- tests/mocks/Unity/Indicators/FakeMenuPage.qml	2014-09-09 15:10:52 +0000
+++ tests/mocks/Unity/Indicators/FakeMenuPage.qml	1970-01-01 00:00:00 +0000
@@ -1,27 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-Flickable {
-    objectName: "fakeMenuPlugin"
-    // Make it compatible with the PluginItem interface
-    function reset() {
-        if (shell != undefined && shell.indicator_status != undefined) {
-            shell.indicator_status[objectName].reset++;
-        }
-    }
-}

=== modified file 'tests/mocks/Unity/Indicators/Indicators.qmltypes'
--- tests/mocks/Unity/Indicators/Indicators.qmltypes	2014-09-01 12:18:53 +0000
+++ tests/mocks/Unity/Indicators/Indicators.qmltypes	2014-10-14 14:19:22 +0000
@@ -29,6 +29,7 @@
         exports: ["Unity.Indicators/FakeIndicatorsModel 0.1"]
         exportMetaObjectRevisions: [0]
         Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "modelData"; type: "QVariant" }
         Method {
             name: "load"
             Parameter { name: "profile"; type: "string" }
@@ -39,6 +40,15 @@
             Parameter { name: "row"; type: "QVariantMap" }
         }
         Method {
+            name: "insert"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "data"; type: "QVariantMap" }
+        }
+        Method {
+            name: "remove"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
             name: "data"
             type: "QVariant"
             Parameter { name: "row"; type: "int" }
@@ -46,6 +56,27 @@
         }
     }
     Component {
+        name: "FakeUnityMenuModelCache"
+        prototype: "UnityMenuModelCache"
+        exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Method {
+            name: "setCachedModelData"
+            Parameter { name: "bus"; type: "QByteArray" }
+            Parameter { name: "path"; type: "QByteArray" }
+            Parameter { name: "actions"; type: "QVariantMap" }
+            Parameter { name: "data"; type: "QVariant" }
+        }
+        Method {
+            name: "setCachedModelData"
+            Parameter { name: "bus"; type: "QByteArray" }
+            Parameter { name: "path"; type: "QByteArray" }
+            Parameter { name: "actions"; type: "QVariantMap" }
+        }
+    }
+    Component {
         name: "FlatMenuProxyModelRole"
         prototype: "QObject"
         exports: ["Unity.Indicators/FlatMenuProxyModelRole 0.1"]
@@ -160,19 +191,18 @@
     }
     Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
     Component {
+        name: "SharedUnityMenuModel"
+        prototype: "QObject"
+        exports: ["Unity.Indicators/SharedUnityMenuModel 0.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "busName"; type: "QByteArray" }
+        Property { name: "menuObjectPath"; type: "QByteArray" }
+        Property { name: "actions"; type: "QVariantMap" }
+        Property { name: "model"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }
+    }
+    Component {
         name: "UnityMenuModelCache"
         prototype: "QObject"
-        exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]
-        isCreatable: false
-        isSingleton: true
-        exportMetaObjectRevisions: [0]
-        Method {
-            name: "model"
-            type: "UnityMenuModel*"
-            Parameter { name: "bus"; type: "QByteArray" }
-            Parameter { name: "path"; type: "QByteArray" }
-            Parameter { name: "actions"; type: "QVariantMap" }
-        }
         Method {
             name: "contains"
             type: "bool"

=== modified file 'tests/mocks/Unity/Indicators/IndicatorsModel.qml'
--- tests/mocks/Unity/Indicators/IndicatorsModel.qml	2014-03-03 11:55:00 +0000
+++ tests/mocks/Unity/Indicators/IndicatorsModel.qml	2014-10-14 14:19:22 +0000
@@ -18,43 +18,151 @@
 import Unity.Indicators 0.1 as Indicators
 
 Indicators.FakeIndicatorsModel {
+    id: root
+
+    Component.onCompleted: {
+        Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicators.fake1",
+                                           "/com/canonical/indicators/fake1",
+                                           "/com/canonical/indicators/fake1",
+                                           getUnityMenuModelData("fake-indicator-bluetooth",
+                                                                 "Bluetooth (F)",
+                                                                 "",
+                                                                 [ "image://theme/bluetooth-active" ]));
+        Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicators.fake2",
+                                           "/com/canonical/indicators/fake2",
+                                           "/com/canonical/indicators/fake2",
+                                           getUnityMenuModelData("fake-indicator-network",
+                                                                 "Network (F)",
+                                                                 "",
+                                                                 [ "image://theme/simcard-error", "image://theme/wifi-high" ]));
+        Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicators.fake3",
+                                           "/com/canonical/indicators/fake3",
+                                           "/com/canonical/indicators/fake3",
+                                           getUnityMenuModelData("fake-indicator-sound",
+                                                                 "Messages (F)",
+                                                                 "",
+                                                                 [ "image://theme/messages-new" ]));
+        Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicators.fake4",
+                                           "/com/canonical/indicators/fake4",
+                                           "/com/canonical/indicators/fake4",
+                                           getUnityMenuModelData("fake-indicator-power",
+                                                                 "Sound (F)",
+                                                                 "",
+                                                                 [ "image://theme/audio-volume-high" ]));
+        Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicators.fake5",
+                                           "/com/canonical/indicators/fake5",
+                                           "/com/canonical/indicators/fake5",
+                                           getUnityMenuModelData("fake-indicator-power",
+                                                                 "Battery (F)",
+                                                                 "",
+                                                                 [ "image://theme/battery-020" ]));
+    }
+
+    function getUnityMenuModelData(identifier, title, label, icons) {
+        var root = [{
+            "rowData": {                // 1
+                "label": "",
+                "sensitive": true,
+                "isSeparator": false,
+                "icon": "",
+                "type": "com.canonical.indicator.root",
+                "ext": {},
+                "action": "",
+                "actionState": {
+                    "title": title,
+                    "label": label,
+                    "icons": icons
+                },
+                "isCheck": false,
+                "isRadio": false,
+                "isToggled": false,
+            },
+            "submenu": []
+        }];
+
+        var submenus = [];
+        for (var i = 0; i < 8; i++) {
+            var submenu = {
+                "rowData": {                 // 1.1
+                    "label": identifier,
+                    "sensitive": true,
+                    "isSeparator": false,
+                    "icon": "",
+                    "type": undefined,
+                    "ext": {},
+                    "action": "",
+                    "actionState": {},
+                    "isCheck": false,
+                    "isRadio": false,
+                    "isToggled": false,
+            }};
+            submenus.push(submenu);
+        }
+        root[0]["submenu"] = submenus;
+
+        return root;
+    }
+
+    property var originalModelData: [
+        {
+            "identifier": "indicator-fake1",
+            "widgetSource": "Indicators/DefaultIndicatorWidget.qml",
+            "pageSource": "Indicators/DefaultIndicatorPage.qml",
+            "indicatorProperties": {
+                "enabled": true,
+                "busName": "com.canonical.indicators.fake1",
+                "menuObjectPath": "/com/canonical/indicators/fake1",
+                "actionsObjectPath": "/com/canonical/indicators/fake1"
+            }
+        },
+        {
+            "identifier": "indicator-fake2",
+            "widgetSource": "Indicators/DefaultIndicatorWidget.qml",
+            "pageSource": "Indicators/DefaultIndicatorPage.qml",
+            "indicatorProperties": {
+                "enabled": true,
+                "busName": "com.canonical.indicators.fake2",
+                "menuObjectPath": "/com/canonical/indicators/fake2",
+                "actionsObjectPath": "/com/canonical/indicators/fake2"
+            }
+        },
+        {
+            "identifier": "indicator-fake3",
+            "widgetSource": "Indicators/DefaultIndicatorWidget.qml",
+            "pageSource": "Indicators/DefaultIndicatorPage.qml",
+            "indicatorProperties": {
+                "enabled": true,
+                "busName": "com.canonical.indicators.fake3",
+                "menuObjectPath": "/com/canonical/indicators/fake3",
+                "actionsObjectPath": "/com/canonical/indicators/fake3"
+            }
+        },
+        {
+            "identifier": "indicator-fake4",
+            "widgetSource": "Indicators/DefaultIndicatorWidget.qml",
+            "pageSource": "Indicators/DefaultIndicatorPage.qml",
+            "indicatorProperties": {
+                "enabled": true,
+                "busName": "com.canonical.indicators.fake4",
+                "menuObjectPath": "/com/canonical/indicators/fake4",
+                "actionsObjectPath": "/com/canonical/indicators/fake4"
+            }
+        },
+        {
+            "identifier": "indicator-fake5",
+            "widgetSource": "Indicators/DefaultIndicatorWidget.qml",
+            "pageSource": "Indicators/DefaultIndicatorPage.qml",
+            "indicatorProperties": {
+                "enabled": true,
+                "busName": "com.canonical.indicators.fake5",
+                "menuObjectPath": "/com/canonical/indicators/fake5",
+                "actionsObjectPath": "/com/canonical/indicators/fake5"
+            }
+        }
+    ]
 
     function load(profile) {
         unload();
-
-        append({    "identifier": "indicator-fake1",
-                    "position": 0,
-                    "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget1.qml",
-                    "pageSource": "qrc:/tests/indciators/qml/fake_menu_page1.qml",
-                    "indicatorProperties": { enabled: true }
-        });
-
-        append({    "identifier": "indicator-fake2",
-                    "position": 1,
-                    "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget2.qml",
-                    "pageSource": "qrc:/tests/indciators/qml/fake_menu_page2.qml",
-                    "indicatorProperties": { enabled: true }
-        });
-
-        append({    "identifier": "indicator-fake3",
-                    "position": 2,
-                    "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget3.qml",
-                    "pageSource": "qrc:/tests/indciators/qml/fake_menu_page3.qml",
-                    "indicatorProperties": { enabled: true }
-        });
-
-        append({    "identifier": "indicator-fake4",
-                    "position": 3,
-                    "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget4.qml",
-                    "pageSource": "qrc:/tests/indciators/qml/fake_menu_page4.qml",
-                    "indicatorProperties": { enabled: true }
-        });
-
-        append({    "identifier": "indicator-fake5",
-                    "position": 4,
-                    "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget5.qml",
-                    "pageSource": "qrc:/tests/indciators/qml/fake_menu_page5.qml",
-                    "indicatorProperties": { enabled: true }
-        });
+        root.modelData = originalModelData;
     }
 }

=== modified file 'tests/mocks/Unity/Indicators/RootActionState.qml'
--- tests/mocks/Unity/Indicators/RootActionState.qml	2013-10-28 18:19:15 +0000
+++ tests/mocks/Unity/Indicators/RootActionState.qml	2014-10-14 14:19:22 +0000
@@ -19,15 +19,23 @@
 
 import QtQuick 2.0
 
-QtObject {
-    property var menu
-    property bool valid: false
-    property string title
-    property string leftLabel
-    property string rightLabel
-    property var icons
-    property string accessibleName
-    property bool visible: true
+Item {
+    property var menu: null
+    property bool valid: cachedState !== undefined
+    property string title: cachedState && cachedState.hasOwnProperty("title") ? cachedState["title"] : ""
+    property string leftLabel: cachedState && cachedState.hasOwnProperty("pre-label") ? cachedState["pre-label"] : ""
+    property string rightLabel: cachedState && cachedState.hasOwnProperty("label") ? cachedState["label"] : ""
+    property var icons: cachedState && cachedState.hasOwnProperty("icons") ? cachedState["icons"] : []
+    property string accessibleName: cachedState && cachedState.hasOwnProperty("accessible-desc") ? cachedState["accessible-desc"] : ""
+    visible: cachedState && cachedState.hasOwnProperty("visible") ? cachedState["visible"] : true
+
+    property var cachedState: menu ? menu.get(0, "actionState") : undefined
+    Connections {
+        target: menu
+        onModelDataChanged: {
+            cachedState = menu.get(0, "actionState");
+        }
+    }
 
     signal updated
 

=== modified file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp'
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp	2014-07-01 09:49:24 +0000
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp	2014-10-14 14:19:22 +0000
@@ -31,7 +31,6 @@
 /*! \internal */
 FakeIndicatorsModel::~FakeIndicatorsModel()
 {
-    qDeleteAll(m_indicators);
 }
 
 int FakeIndicatorsModel::count() const
@@ -47,29 +46,61 @@
 {
     beginResetModel();
 
-    qDeleteAll(m_indicators);
-    m_indicators.clear();
-
-    endResetModel();
-}
-
-
-void FakeIndicatorsModel::append(const QVariantMap& row)
-{
-    Indicator* new_row = new QHash<int, QVariant>();
-    for (auto iter = row.begin(); iter != row.end(); ++iter )
-    {
-        int key = roleNames().key(iter.key().toUtf8(), -1);
-        if (key != -1) {
-            new_row->insert(key, iter.value());
-        }
-    }
-
-    beginInsertRows(QModelIndex(), m_indicators.count(), m_indicators.count());
-
-    m_indicators.append(new_row);
-
-    endInsertRows();
+    m_modelData.clear();
+    Q_EMIT modelDataChanged();
+
+    endResetModel();
+}
+
+
+void FakeIndicatorsModel::append(const QVariantMap& data)
+{
+    QList<QVariant> allData = m_modelData.toList();
+    beginInsertRows(QModelIndex(), allData.count(), allData.count());
+
+    allData.append(data);
+    m_modelData = allData;
+    Q_EMIT modelDataChanged();
+
+    endInsertRows();
+}
+
+void FakeIndicatorsModel::insert(int row, const QVariantMap& data)
+{
+    QList<QVariant> allData = m_modelData.toList();
+    row = qMax(0, qMin(row, allData.count()));
+
+    beginInsertRows(QModelIndex(), row, row);
+
+    allData.insert(row, data);
+    m_modelData = allData;
+    Q_EMIT modelDataChanged();
+
+    endInsertRows();
+}
+
+void FakeIndicatorsModel::remove(int row)
+{
+    QList<QVariant> allData = m_modelData.toList();
+    row = qMax(0, qMin(row, allData.count()));
+
+    beginRemoveRows(QModelIndex(), row, row);
+
+    allData.removeAt(row);
+    m_modelData = allData;
+    Q_EMIT modelDataChanged();
+
+    endRemoveRows();
+}
+
+void FakeIndicatorsModel::setModelData(const QVariant& modelData)
+{
+    beginResetModel();
+
+    m_modelData = modelData;
+    Q_EMIT modelDataChanged();
+
+    endResetModel();
 }
 
 QHash<int, QByteArray> FakeIndicatorsModel::roleNames() const
@@ -91,18 +122,18 @@
     return 1;
 }
 
-Q_INVOKABLE QVariant FakeIndicatorsModel::data(int row, int role) const
+QVariant FakeIndicatorsModel::data(int row, int role) const
 {
     return data(index(row, 0), role);
 }
 
 QVariant FakeIndicatorsModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid() || index.row() >= m_indicators.size())
+    QList<QVariant> dataList = m_modelData.toList();
+    if (!index.isValid() || index.row() >= dataList.size())
         return QVariant();
 
-    Indicator* indicator = m_indicators[index.row()];
-    return indicator->value(role, QVariant());
+    return dataList[index.row()].toMap()[roleNames()[role]];
 }
 
 QModelIndex FakeIndicatorsModel::parent(const QModelIndex&) const
@@ -112,5 +143,5 @@
 
 int FakeIndicatorsModel::rowCount(const QModelIndex&) const
 {
-    return m_indicators.count();
+    return m_modelData.toList().count();
 }

=== modified file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.h'
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2014-03-03 12:01:09 +0000
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2014-10-14 14:19:22 +0000
@@ -27,6 +27,7 @@
     Q_OBJECT
     Q_ENUMS(Roles)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged)
 public:
 
     FakeIndicatorsModel(QObject *parent=0);
@@ -36,9 +37,14 @@
     Q_INVOKABLE void unload();
 
     Q_INVOKABLE void append(const QVariantMap& row);
+    Q_INVOKABLE void insert(int row, const QVariantMap& data);
+    Q_INVOKABLE void remove(int row);
 
     Q_INVOKABLE QVariant data(int row, int role) const;
 
+    void setModelData(const QVariant& data);
+    QVariant modelData() const { return m_modelData; }
+
     /* QAbstractItemModel */
     QHash<int, QByteArray> roleNames() const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -48,12 +54,12 @@
 
 Q_SIGNALS:
     void countChanged();
+    void modelDataChanged();
 
 private:
     int count() const;
 
-    typedef QHash<int, QVariant> Indicator;
-    QList<Indicator*> m_indicators;
+    QVariant m_modelData;
 };
 
 #endif // FAKE_INDICATORSMODEL_H

=== modified file 'tests/mocks/Unity/Indicators/fakeplugin.cpp'
--- tests/mocks/Unity/Indicators/fakeplugin.cpp	2014-08-20 08:39:09 +0000
+++ tests/mocks/Unity/Indicators/fakeplugin.cpp	2014-10-14 14:19:22 +0000
@@ -26,19 +26,22 @@
 #include "fakeindicatorsmodel.h"
 #include "indicators.h"
 #include "menucontentactivator.h"
-#include "unitymenumodelcache.h"
+#include "sharedunitymenumodel.h"
+#include "fakeunitymenumodelcache.h"
 #include "unitymenumodelstack.h"
 #include "visibleindicatorsmodel.h"
 
+#include <unitymenumodel.h>
+
 static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
   Q_UNUSED(engine);
   Q_UNUSED(scriptEngine);
-  return new UnityMenuModelCache;
+  return FakeUnityMenuModelCache::singleton();
 }
 
 void IndicatorsFakePlugin::registerTypes(const char * uri)
 {
-    Q_INIT_RESOURCE(indicators_fake);
+    qRegisterMetaType<UnityMenuModel*>("UnityMenuModel*");
 
     // internal
     qmlRegisterType<FakeIndicatorsModel>(uri, 0, 1, "FakeIndicatorsModel");
@@ -47,8 +50,9 @@
     qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
     qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
     qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
+    qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");
 
-    qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
+    qmlRegisterSingletonType<FakeUnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
 
     // external uncreatables
     qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

=== added file 'tests/mocks/Unity/Indicators/fakeunitymenumodelcache.cpp'
--- tests/mocks/Unity/Indicators/fakeunitymenumodelcache.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Indicators/fakeunitymenumodelcache.cpp	2014-10-14 14:19:22 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014 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/>.
+ */
+
+#include "fakeunitymenumodelcache.h"
+#include <unitymenumodel.h>
+
+QPointer<FakeUnityMenuModelCache> FakeUnityMenuModelCache::theFakeCache = nullptr;
+
+FakeUnityMenuModelCache* FakeUnityMenuModelCache::singleton()
+{
+    if (theFakeCache.isNull()) {
+        theFakeCache = new FakeUnityMenuModelCache();
+    }
+    return theFakeCache.data();
+}
+
+FakeUnityMenuModelCache::FakeUnityMenuModelCache(QObject* parent)
+    : UnityMenuModelCache(parent)
+{
+}
+
+QSharedPointer<UnityMenuModel> FakeUnityMenuModelCache::model(const QByteArray& bus,
+                                                              const QByteArray& path,
+                                                              const QVariantMap& actions)
+{
+    return UnityMenuModelCache::singleton()->model(bus, path, actions);
+}
+
+bool FakeUnityMenuModelCache::contains(const QByteArray& path)
+{
+    return UnityMenuModelCache::singleton()->contains(path);
+}
+
+void FakeUnityMenuModelCache::setCachedModelData(const QByteArray& bus,
+                                                 const QByteArray& path,
+                                                 const QVariantMap& actions,
+                                                 const QVariant& data)
+{
+    // keep a ref forever!
+    if (!m_models.contains(path)) {
+        m_models[path] = model(bus, path, actions);
+    }
+    m_models[path]->setModelData(data);
+}

=== added file 'tests/mocks/Unity/Indicators/fakeunitymenumodelcache.h'
--- tests/mocks/Unity/Indicators/fakeunitymenumodelcache.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Indicators/fakeunitymenumodelcache.h	2014-10-14 14:19:22 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2014 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/>.
+ */
+
+#ifndef FAKEUNITYMENUMODELCACHE_H
+#define FAKEUNITYMENUMODELCACHE_H
+
+#include "unitymenumodelcache.h"
+
+#include <QVariantMap>
+
+class FakeUnityMenuModelCache : public UnityMenuModelCache
+{
+    Q_OBJECT
+public:
+    FakeUnityMenuModelCache(QObject* parent = nullptr);
+
+    static FakeUnityMenuModelCache* singleton();
+
+    QSharedPointer<UnityMenuModel> model(const QByteArray& bus,
+                                             const QByteArray& path,
+                                             const QVariantMap& actions) override;
+    bool contains(const QByteArray& path) override;
+
+
+
+    Q_INVOKABLE void setCachedModelData(const QByteArray& bus,
+                                        const QByteArray& path,
+                                        const QVariantMap& actions,
+                                        const QVariant& data = QVariant());
+
+private:
+    static QPointer<FakeUnityMenuModelCache> theFakeCache;
+    QHash<QByteArray, QSharedPointer<UnityMenuModel>> m_models;
+};
+
+#endif // FAKEUNITYMENUMODELCACHE_H

=== removed file 'tests/mocks/Unity/Indicators/indicators_fake.qrc'
--- tests/mocks/Unity/Indicators/indicators_fake.qrc	2013-06-17 09:02:14 +0000
+++ tests/mocks/Unity/Indicators/indicators_fake.qrc	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<RCC>
-    <qresource prefix="/tests/indciators">
-        <file>qml/fake_menu_widget1.qml</file>
-        <file>qml/fake_menu_widget2.qml</file>
-        <file>qml/fake_menu_widget3.qml</file>
-        <file>qml/fake_menu_widget4.qml</file>
-        <file>qml/fake_menu_widget5.qml</file>
-        <file>qml/fake_menu_page1.qml</file>
-        <file>qml/fake_menu_page2.qml</file>
-        <file>qml/fake_menu_page3.qml</file>
-        <file>qml/fake_menu_page4.qml</file>
-        <file>qml/fake_menu_page5.qml</file>
-    </qresource>
-</RCC>

=== removed directory 'tests/mocks/Unity/Indicators/qml'
=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_page1.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_page1.qml	2014-01-14 16:44:35 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_page1.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Unity.Indicators 0.1 as Indicators
-
-Indicators.FakeMenuPage {
-    id: menu_plugin1
-
-    Rectangle {
-        id: contents
-        color: "red"
-
-        height: 150
-        width: 150
-
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            verticalCenter: parent.verticalCenter
-        }
-    }
-}

=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_page2.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_page2.qml	2014-01-14 16:44:35 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_page2.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Unity.Indicators 0.1 as Indicators
-
-Indicators.FakeMenuPage {
-    id: menu_plugin2
-
-    Rectangle {
-        id: contents
-        color: "blue"
-
-        height: 150
-        width: 150
-
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            verticalCenter: parent.verticalCenter
-        }
-    }
-}

=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_page3.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_page3.qml	2014-01-14 16:44:35 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_page3.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Unity.Indicators 0.1 as Indicators
-
-Indicators.FakeMenuPage {
-    id: menu_plugin3
-
-    Rectangle {
-        id: contents
-        color: "yellow"
-
-        height: 150
-        width: 150
-
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            verticalCenter: parent.verticalCenter
-        }
-    }
-}

=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_page4.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_page4.qml	2014-01-14 16:44:35 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_page4.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Unity.Indicators 0.1 as Indicators
-
-Indicators.FakeMenuPage {
-    id: menu_plugin4
-
-    Rectangle {
-        id: contents
-        color: "green"
-
-        height: 150
-        width: 150
-
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            verticalCenter: parent.verticalCenter
-        }
-    }
-}

=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_page5.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_page5.qml	2014-01-14 16:44:35 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_page5.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Unity.Indicators 0.1 as Indicators
-
-Indicators.FakeMenuPage {
-    id: menu_plugin5
-
-    Rectangle {
-        id: contents
-        color: "orange"
-
-        height: 150
-        width: 150
-
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            verticalCenter: parent.verticalCenter
-        }
-    }
-}

=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_widget1.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_widget1.qml	2013-06-17 09:02:14 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_widget1.qml	1970-01-01 00:00:00 +0000
@@ -1,23 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-Rectangle {
-    width: 40
-    height: 40
-    color : "red"
-}

=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_widget2.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_widget2.qml	2014-01-13 16:25:32 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_widget2.qml	1970-01-01 00:00:00 +0000
@@ -1,23 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-Rectangle {
-    width: 40
-    height: 40
-    color : "blue"
-}

=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_widget3.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_widget3.qml	2014-01-13 16:25:32 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_widget3.qml	1970-01-01 00:00:00 +0000
@@ -1,23 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-Rectangle {
-    width: 40
-    height: 40
-    color : "yellow"
-}

=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_widget4.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_widget4.qml	2013-06-17 09:02:14 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_widget4.qml	1970-01-01 00:00:00 +0000
@@ -1,23 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-Rectangle {
-    width: 40
-    height: 40
-    color : "green"
-}

=== removed file 'tests/mocks/Unity/Indicators/qml/fake_menu_widget5.qml'
--- tests/mocks/Unity/Indicators/qml/fake_menu_widget5.qml	2013-06-17 09:02:14 +0000
+++ tests/mocks/Unity/Indicators/qml/fake_menu_widget5.qml	1970-01-01 00:00:00 +0000
@@ -1,23 +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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-Rectangle {
-    width: 40
-    height: 40
-    color : "orange"
-}

=== modified file 'tests/mocks/Unity/Indicators/qmldir'
--- tests/mocks/Unity/Indicators/qmldir	2014-08-20 08:39:09 +0000
+++ tests/mocks/Unity/Indicators/qmldir	2014-10-14 14:19:22 +0000
@@ -3,5 +3,4 @@
 typeinfo Indicators.qmltypes
 
 IndicatorsModel 0.1 IndicatorsModel.qml
-FakeMenuPage 0.1 FakeMenuPage.qml
 RootActionState 0.1 RootActionState.qml

=== modified file 'tests/mocks/Unity/Launcher/Launcher.qmltypes'
--- tests/mocks/Unity/Launcher/Launcher.qmltypes	2014-06-26 07:47:57 +0000
+++ tests/mocks/Unity/Launcher/Launcher.qmltypes	2014-10-14 14:19:22 +0000
@@ -85,6 +85,7 @@
         Property { name: "recent"; type: "bool"; isReadonly: true }
         Property { name: "progress"; type: "int"; isReadonly: true }
         Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "countVisible"; type: "bool"; isReadonly: true }
         Property { name: "focused"; type: "bool"; isReadonly: true }
         Property {
             name: "quickList"
@@ -93,6 +94,14 @@
             isPointer: true
         }
         Signal {
+            name: "nameChanged"
+            Parameter { name: "name"; type: "string" }
+        }
+        Signal {
+            name: "iconChanged"
+            Parameter { name: "icon"; type: "string" }
+        }
+        Signal {
             name: "pinnedChanged"
             Parameter { name: "pinned"; type: "bool" }
         }
@@ -113,6 +122,10 @@
             Parameter { name: "count"; type: "int" }
         }
         Signal {
+            name: "countVisibleChanged"
+            Parameter { name: "countVisible"; type: "bool" }
+        }
+        Signal {
             name: "focusedChanged"
             Parameter { name: "focused"; type: "bool" }
         }

=== modified file 'tests/mocks/Unity/Unity.qmltypes'
--- tests/mocks/Unity/Unity.qmltypes	2014-09-01 12:18:53 +0000
+++ tests/mocks/Unity/Unity.qmltypes	2014-10-14 14:19:22 +0000
@@ -30,6 +30,25 @@
             Parameter { name: "row"; type: "int" }
             Parameter { name: "role"; type: "int" }
         }
+        Method {
+            name: "setCount"
+            Parameter { name: "count"; type: "int" }
+        }
+        Method {
+            name: "resultModel"
+            type: "ResultsModel*"
+            Parameter { name: "row"; type: "int" }
+        }
+        Method {
+            name: "setLayout"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "layout"; type: "string" }
+        }
+        Method {
+            name: "setHeaderLink"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "headerLink"; type: "string" }
+        }
     }
     Component {
         name: "PreviewModel"
@@ -66,6 +85,10 @@
         exports: ["Unity/FakeResultsModel 0.2", "Unity/ResultsModel 0.2"]
         isCreatable: false
         exportMetaObjectRevisions: [0, 0]
+        Method {
+            name: "setResultCount"
+            Parameter { name: "result_count"; type: "int" }
+        }
     }
     Component {
         name: "Scope"
@@ -76,6 +99,15 @@
             name: "performQuery"
             Parameter { name: "query"; type: "string" }
         }
+        Signal { name: "refreshed" }
+        Method {
+            name: "setId"
+            Parameter { name: "id"; type: "string" }
+        }
+        Method {
+            name: "setName"
+            Parameter { name: "name"; type: "string" }
+        }
         Method {
             name: "setSearchInProgress"
             Parameter { name: "inProg"; type: "bool" }

=== modified file 'tests/plugins/Unity/Indicators/CMakeLists.txt'
--- tests/plugins/Unity/Indicators/CMakeLists.txt	2013-12-10 14:22:43 +0000
+++ tests/plugins/Unity/Indicators/CMakeLists.txt	2014-10-14 14:19:22 +0000
@@ -40,3 +40,4 @@
 indicator_test(menucontentactivatortest ADDITIONAL_CPPS ${INDICATORS_DIR}/menucontentactivator.cpp)
 indicator_test(unitymenumodelstacktest ADDITIONAL_CPPS ${TEST_DIR}/mocks/QMenuModel/unitymenumodel.cpp ${INDICATORS_DIR}/unitymenumodelstack.cpp)
 indicator_test(rootactionstatetest ADDITIONAL_LIBS IndicatorsQml)
+indicator_test(sharedunitymenumodeltest ADDITIONAL_LIBS IndicatorsQml)

=== added file 'tests/plugins/Unity/Indicators/sharedunitymenumodeltest.cpp'
--- tests/plugins/Unity/Indicators/sharedunitymenumodeltest.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Unity/Indicators/sharedunitymenumodeltest.cpp	2014-10-14 14:19:22 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2014 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/>.
+ *
+ */
+
+#include "sharedunitymenumodel.h"
+#include "unitymenumodelcache.h"
+
+#include <QtTest>
+#include <unitymenumodel.h>
+
+class SharedUnityMenuModelTest : public QObject
+{
+    Q_OBJECT
+
+    SharedUnityMenuModel* createFullModel(const QByteArray& testId)
+    {
+        SharedUnityMenuModel* model = new SharedUnityMenuModel;
+        model->setBusName("com.canonical." + testId);
+        model->setMenuObjectPath("/com/canonical/" + testId);
+        QVariantMap actions;
+        actions["test"] = QString("/com/canonical/%1/actions").arg(QString(testId));
+        model->setActions(actions);
+
+        return model;
+    }
+
+private Q_SLOTS:
+
+    void testCreateModel()
+    {
+        QSharedPointer<SharedUnityMenuModel> model(createFullModel("test1"));
+        QVERIFY(model->model() != nullptr);
+    }
+
+    void testDifferentDataCreatesDifferentModels()
+    {
+        QSharedPointer<SharedUnityMenuModel> model1(createFullModel("test1"));
+        QSharedPointer<SharedUnityMenuModel> model2(createFullModel("test2"));
+
+        QVERIFY(model1->model() != model2->model());
+    }
+
+    void testSameDataCreatesSameModels()
+    {
+        QSharedPointer<SharedUnityMenuModel> model1(createFullModel("test1"));
+        QSharedPointer<SharedUnityMenuModel> model2(createFullModel("test1"));
+
+        QCOMPARE(model1->model(), model2->model());
+    }
+
+    void testSharedOwnership()
+    {
+        QSharedPointer<SharedUnityMenuModel> model1(createFullModel("test1"));
+        QSharedPointer<SharedUnityMenuModel> model2(createFullModel("test1"));
+
+        QCOMPARE(UnityMenuModelCache::singleton()->contains("/com/canonical/test1"), true);
+        model1.clear();
+        QCOMPARE(UnityMenuModelCache::singleton()->contains("/com/canonical/test1"), true);
+        model2.clear();
+        QCOMPARE(UnityMenuModelCache::singleton()->contains("/com/canonical/test1"), false);
+    }
+
+    // Tests that changing cached model data does not change the model path of others
+    void testLP1328646()
+    {
+        QSharedPointer<SharedUnityMenuModel> model1(createFullModel("test1"));
+        QSharedPointer<SharedUnityMenuModel> model2(createFullModel("test1"));
+
+        model2->setMenuObjectPath("/com/canonical/LP1328646");
+
+        QVERIFY(model1->model() != model2->model());
+        QCOMPARE(model1->model()->menuObjectPath(), QByteArray("/com/canonical/test1"));
+        QCOMPARE(model2->model()->menuObjectPath(), QByteArray("/com/canonical/LP1328646"));
+    }
+
+    // Tests that the cache is recreated if deleted.
+    void testDeletedCache()
+    {
+        QSharedPointer<SharedUnityMenuModel> model1(createFullModel("test1"));
+
+        QCOMPARE(UnityMenuModelCache::singleton()->contains("/com/canonical/test1"), true);
+        delete UnityMenuModelCache::singleton();
+        QCOMPARE(UnityMenuModelCache::singleton()->contains("/com/canonical/test1"), false);
+    }
+
+};
+
+QTEST_GUILESS_MAIN(SharedUnityMenuModelTest)
+#include "sharedunitymenumodeltest.moc"

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-10-01 13:22:00 +0000
+++ tests/qmltests/CMakeLists.txt	2014-10-14 14:19:22 +0000
@@ -19,9 +19,9 @@
 set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
 set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
 
-add_qml_test(. Shell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
-add_qml_test(. ShellWithPin ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin")
-add_qml_test(. TabletShell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
+add_qml_test(. Shell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
+add_qml_test(. ShellWithPin ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
+add_qml_test(. TabletShell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 add_qml_test(Components Background)
 add_qml_test(Components Carousel)
 add_qml_test(Components DraggingArea)
@@ -72,14 +72,13 @@
 add_qml_test(Notifications Notifications)
 add_qml_test(Notifications VisualSnapDecisionsQueue)
 add_qml_test(Panel ActiveCallHint)
-add_qml_test(Panel IndicatorRow)
-add_qml_test(Panel Indicators)
-add_qml_test(Panel MenuContent)
-add_qml_test(Panel Panel)
+add_qml_test(Panel IndicatorRow ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
+add_qml_test(Panel Indicators ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
+add_qml_test(Panel MenuContent ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
+add_qml_test(Panel Panel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 add_qml_test(Panel SearchIndicator)
 add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
-add_qml_test(Panel/Indicators CachedUnityMenuModel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 # These MenuItemFactory tests need the test/mocks/ to come before plugins/
 add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
--- tests/qmltests/Greeter/tst_Clock.qml	2014-05-01 14:25:18 +0000
+++ tests/qmltests/Greeter/tst_Clock.qml	2014-10-14 14:19:22 +0000
@@ -19,7 +19,7 @@
 import ".."
 import "../../../qml/Greeter"
 import Ubuntu.Components 0.1
-import QMenuModel 0.1
+import Unity.Indicators 0.1 as Indicators
 import Unity.Test 0.1 as UT
 
 Rectangle {
@@ -36,56 +36,73 @@
         }
     }
 
-    UnityMenuModel {
-        id: menuModel
-        modelData: [{
-            "rowData": {
-                "actionState": { "label": Qt.formatTime(new Date("October 13, 1975 11:13:00")) }
-            }
-        }]
+    function updateDatetimeModelTime(label) {
+        Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicator.datetime",
+            "/com/canonical/indicator/datetime/phone",
+            "/com/canonical/indicator/datetime",
+            [{
+                "rowData": {
+                    "actionState": { "label": label }
+                }
+            }]);
     }
 
     UT.UnityTestCase {
         name: "Clock"
+        when: windowShown
 
         function init() {
-            var cachedModel = findChild(clock, "timeModel");
-            verify(cachedModel !== undefined);
-            cachedModel.model = menuModel;
-        }
-
-        function test_customDate() {
-            var dateObj = new Date("October 13, 1975 11:13:00")
-            var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)
-            var timeString = Qt.formatTime(dateObj)
-
-            clock.currentDate = dateObj
-            var dateLabel = findChild(clock, "dateLabel")
-            compare(dateLabel.text, dateString, "Not the expected date")
-            var timeLabel = findChild(clock, "timeLabel")
-            compare(timeLabel.text, timeString, "Not the expected time")
-        }
-
-        function test_dateUpdate() {
-            var dateObj = new Date("October 13, 1975 11:13:00")
-            var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)
-            var timeString = Qt.formatTime(dateObj)
-
+            updateDatetimeModelTime(Qt.formatTime(new Date("October 13, 1975 12:14:00")));
+            clock.visible = true;
+        }
+
+        // Test that the date portion of the clock updates with custom value.
+        // Time portion is controlled by indicators
+        function test_updateDate() {
+            var dateLabel = findChild(clock, "dateLabel");
+            var timeLabel = findChild(clock, "timeLabel");
+
+            var timeString = Qt.formatTime(new Date("October 13, 1975 12:14:00"));
+
+            // initial date.
+            var dateObj = new Date("October 13, 1975 11:13:00");
+            var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate);
+            clock.currentDate = dateObj;
+
+            compare(dateLabel.text, dateString, "Not the expected date");
+            compare(timeLabel.text, timeString, "Time should come from indicators");
+
+            // update date.
+            var dateObj2 = new Date("October 14, 1976 13:15:00");
+            var dateString2 = Qt.formatDate(dateObj2, Qt.DefaultLocaleLongDate);
+            clock.currentDate = dateObj2;
+
+            compare(dateLabel.text, dateString2, "Not the expected date");
+            compare(timeLabel.text,timeString, "Time should come from indicators");
+        }
+
+        // Test that the date portion of the clock updates with custom value.
+        // Time portion is controlled by indicators
+        function test_updateTime() {
+            var timeLabel = findChild(clock, "timeLabel");
+
+            var timeString1 = Qt.formatTime(new Date("October 13, 1975 11:15:00"));
+            var timeString2 = Qt.formatTime(new Date("October 14, 1976 12:16:00"));
+
+            updateDatetimeModelTime(timeString1);
+            compare(timeLabel.text, timeString1, "Time should come from indicators");
+
+            updateDatetimeModelTime(timeString2);
+            compare(timeLabel.text, timeString2, "Time should come from indicators");
+        }
+
+        function test_indicatorDisconnect() {
             clock.visible = false
             var timeModel = findInvisibleChild(clock, "timeModel")
-
             compare(timeModel.menuObjectPath, "", "Clock shouldn't be connected to Indicators when not visible.")
 
-            clock.currentDate = dateObj
-
-            var dateLabel = findChild(clock, "dateLabel")
-            compare(dateLabel.text, dateString, "Not the expected date")
-            var timeLabel = findChild(clock, "timeLabel")
-            compare(timeLabel.text, timeString, "Not the expected time")
-
             clock.visible = true
-
-            verify(timeModel.menuObjectPath != "", "Should be connected to Indicators.")
+            verify(timeModel.menuObjectPath !== "", "Should be connected to Indicators.")
         }
     }
 }

=== removed file 'tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml'
--- tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml	2014-08-20 09:16:28 +0000
+++ tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import QtTest 1.0
-import Unity.Test 0.1 as UT
-import QMenuModel 0.1
-import Unity.Indicators 0.1 as Indicators
-import "../../../../qml/Panel/Indicators"
-
-Item {
-    id: root
-    width: units.gu(40)
-    height: units.gu(70)
-
-    Component {
-        id: model
-        CachedUnityMenuModel {}
-    }
-
-    UT.UnityTestCase {
-        name: "CachedUnityMenuModel"
-        when: windowShown
-
-        function cleanup() {
-            doGC();
-        }
-
-        function doGC() {
-            // need to put some wait cycles here to get gc going properly.
-            wait(10);
-            gc();
-            wait(10);
-        }
-
-        function test_createDifferent() {
-            var cachedObject = model.createObject(null,
-                               {
-                                   "busName": "com.canonical.test1",
-                                   "menuObjectPath": "/com/canonical/test1",
-                                   "actionsObjectPath": "/com/canonical/test1"
-                               });
-
-            var cachedObject2 = model.createObject(null,
-                               {
-                                   "busName": "com.canonical.test2",
-                                   "menuObjectPath": "/com/canonical/test2",
-                                   "actionsObjectPath": "/com/canonical/test2"
-                               });
-
-            verify(cachedObject.model !== cachedObject2.model);
-        }
-
-        function test_createSame() {
-            var cachedObject = model.createObject(null,
-                               {
-                                   "busName": "com.canonical.test3",
-                                   "menuObjectPath": "/com/canonical/test3",
-                                   "actionsObjectPath": "/com/canonical/test3"
-                               });
-
-            var cachedObject2 = model.createObject(null,
-                               {
-                                   "busName": "com.canonical.test3",
-                                   "menuObjectPath": "/com/canonical/test3",
-                                   "actionsObjectPath": "/com/canonical/test3"
-                               });
-
-            verify(cachedObject.model === cachedObject2.model);
-        }
-
-        // Tests that changing cached model data does not change the model path of others
-        function test_lp1328646() {
-            var cachedObject = model.createObject(null,
-                               {
-                                   "busName": "com.canonical.test4",
-                                   "menuObjectPath": "/com/canonical/test4",
-                                   "actionsObjectPath": "/com/canonical/test4"
-                               });
-
-            var cachedObject2 = model.createObject(null,
-                               {
-                                   "busName": "com.canonical.test4",
-                                   "menuObjectPath": "/com/canonical/test4",
-                                   "actionsObjectPath": "/com/canonical/test4"
-                               });
-
-            cachedObject.menuObjectPath = "/com/canonical/test5";
-            compare(cachedObject.model.menuObjectPath, "/com/canonical/test5");
-            compare(cachedObject2.model.menuObjectPath, "/com/canonical/test4");
-
-            verify(cachedObject.model !== cachedObject2.model);
-        }
-
-        function createAndDestroy(test) {
-            var cachedObject = model.createObject(null,
-                               {
-                                   "busName": "com.canonical."+test,
-                                   "menuObjectPath": "/com/canonical/"+test,
-                                   "actionsObjectPath": "/com/canonical/"+test
-                               });
-            var cachedObject2 = model.createObject(null,
-                               {
-                                   "busName": "com.canonical."+test,
-                                   "menuObjectPath": "/com/canonical/"+test,
-                                   "actionsObjectPath": "/com/canonical/"+test
-                               });
-            cachedObject.destroy();
-            return cachedObject2;
-        }
-
-        function test_destroyAllDeletesModel() {
-            createAndDestroy("test6");
-            doGC();
-            compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test6"), false);
-        }
-
-        function test_destroyPartialKeepsModel() {
-            var model = createAndDestroy("test7");
-            doGC();
-            compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test7"), true);
-        }
-    }
-}

=== modified file 'tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml'
--- tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-09-29 10:24:58 +0000
+++ tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-10-14 14:19:22 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Unity.Test 0.1 as UT
-import QMenuModel 0.1
+import Unity.Indicators 0.1 as Indicators
 import "../../../../qml/Panel/Indicators"
 
 Item {
@@ -25,18 +25,14 @@
     width: units.gu(40)
     height: units.gu(70)
 
-   DefaultIndicatorPage {
+    DefaultIndicatorPage {
         id: page
-
         anchors.fill: parent
 
-        menuModel: UnityMenuModel {}
-        busName: "test"
-        actionsObjectPath: "test"
-        menuObjectPath: "test"
-
         identifier: "test-indicator"
-        rootMenuType: "com.canonical.indicator.root"
+        busName: "com.caninical.indicator.test"
+        actionsObjectPath: "/com/canonical/indicator/test"
+        menuObjectPath: "/com/canonical/indicator/test"
     }
 
     property var fullMenuData: [{
@@ -113,29 +109,30 @@
             "submenu": []
         }]; // end row 1
 
+    function initializeMenuData(data) {
+        Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicator.test",
+                                                          "/com/canonical/indicator/test",
+                                                          "/com/canonical/indicator/test",
+                                                          data);
+    }
+
     UT.UnityTestCase {
         name: "DefaultIndicatorPage"
 
         function init() {
-            var mainMenu = findChild(page, "mainMenu");
-            page.menuModel.modelData = [];
-            verify(mainMenu.model !== null);
+            initializeMenuData([]);
         }
 
         function test_reloadData() {
             var mainMenu = findChild(page, "mainMenu");
 
-            page.menuModel.modelData = [];
-            tryCompare(mainMenu, "count", 0);
-
-            page.menuModel.modelData = fullMenuData;
-            tryCompare(mainMenu, "count", 3);
-
-            page.menuModel.modelData = [];
-            tryCompare(mainMenu, "count", 0);
-
-            page.menuModel.modelData = fullMenuData;
-            tryCompare(mainMenu, "count", 3);
+            tryCompare(mainMenu, "count", 0);
+
+            initializeMenuData(fullMenuData);
+            tryCompare(mainMenu, "count", 3);
+
+            initializeMenuData([]);
+            tryCompare(mainMenu, "count", 0);
         }
 
         function test_traverse_rootMenuType_data() {
@@ -147,7 +144,7 @@
 
         function test_traverse_rootMenuType(data) {
             page.rootMenuType = data.rootMenuType;
-            page.menuModel.modelData = fullMenuData;
+            initializeMenuData(fullMenuData);
 
             var mainMenu = findChild(page, "mainMenu");
             tryCompare(mainMenu, "count", data.expectedCount);

=== modified file 'tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml'
--- tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml	2014-07-03 13:46:51 +0000
+++ tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml	2014-10-14 14:19:22 +0000
@@ -33,7 +33,6 @@
             top: parent.top
         }
 
-        menuModel: UnityMenuModel {}
         busName: "test"
         actionsObjectPath: "test"
         deviceMenuObjectPath: "test"
@@ -48,13 +47,6 @@
         name: "DefaultIndicatorWidget"
         when: windowShown
 
-        function init() {
-            widget.rootActionState.icons = [];
-            widget.rootActionState.leftLabel = "";
-            widget.rootActionState.rightLabel = "";
-            waitForRendering(widget)
-        }
-
         // FIXME: add tests
     }
 }

=== modified file 'tests/qmltests/Panel/tst_IndicatorItem.qml'
--- tests/qmltests/Panel/tst_IndicatorItem.qml	2014-01-07 14:29:23 +0000
+++ tests/qmltests/Panel/tst_IndicatorItem.qml	2014-10-14 14:19:22 +0000
@@ -43,7 +43,7 @@
 
         function test_empty() {
             compare(indicatorItem.indicatorVisible, false, "IndicatorItem should not be visible.");
-            indicatorItem.widgetSource = "qrc:/tests/indciators/qml/fake_menu_widget1.qml";
+            indicatorItem.widgetSource = "../../../qml/Panel/Indicators/DefaultIndicatorWidget.qml";
             tryCompare(indicatorItem, "indicatorVisible", true);
         }
     }

=== modified file 'tests/qmltests/Panel/tst_IndicatorRow.qml'
--- tests/qmltests/Panel/tst_IndicatorRow.qml	2014-03-03 11:55:00 +0000
+++ tests/qmltests/Panel/tst_IndicatorRow.qml	2014-10-14 14:19:22 +0000
@@ -30,15 +30,6 @@
     width: units.gu(40)
     height: units.gu(60)
 
-    function init_test()
-    {
-        indicatorModel.load("test1");
-
-        indicatorRow.state = "initial";
-        indicatorRow.setCurrentItemIndex(-1);
-        indicatorRow.unitProgress = 0.0;
-    }
-
     PanelBackground {
         anchors.fill: indicatorRow
     }
@@ -63,20 +54,33 @@
         name: "IndicatorRow"
         when: windowShown
 
+        function init() {
+            indicatorModel.load("test1");
+
+            indicatorRow.state = "initial";
+            indicatorRow.setCurrentItemIndex(-1);
+            indicatorRow.unitProgress = 0.0;
+        }
+
         function get_indicator_item(index) {
             return findChild(indicatorRow.row, "item" + index);
         }
 
         function test_set_current_item() {
-            init_test();
             indicatorRow.setCurrentItemIndex(0);
-            compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake1", "Incorrect item at position 0");
+            compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier),
+                    "indicator-fake1",
+                    "Incorrect item at position 0");
 
             indicatorRow.setCurrentItemIndex(1);
-            compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake2", "Incorrect item at position 1");
+            compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier),
+                    "indicator-fake2",
+                    "Incorrect item at position 1");
 
             indicatorRow.setCurrentItemIndex(2);
-            compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake3", "Incorrect item at position 2");
+            compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier),
+                    "indicator-fake3",
+                    "Incorrect item at position 2");
         }
 
         function test_highlight_data() {
@@ -93,8 +97,6 @@
         }
 
         function test_highlight(data) {
-            init_test();
-
             indicatorRow.unitProgress = data.progress;
             indicatorRow.setCurrentItemIndex(data.index);
 
@@ -119,8 +121,6 @@
         }
 
         function test_opacity(data) {
-            init_test();
-
             indicatorRow.unitProgress = data.progress;
             indicatorRow.setCurrentItemIndex(data.index);
 
@@ -145,8 +145,6 @@
         }
 
         function test_dimmed(data) {
-            init_test();
-
             indicatorRow.unitProgress = data.progress;
             indicatorRow.setCurrentItemIndex(data.index);
 

=== modified file 'tests/qmltests/Panel/tst_Indicators.qml'
--- tests/qmltests/Panel/tst_Indicators.qml	2014-07-30 16:01:09 +0000
+++ tests/qmltests/Panel/tst_Indicators.qml	2014-10-14 14:19:22 +0000
@@ -158,6 +158,7 @@
         function init_invisible_indicator(identifier) {
             tryCompareFunction(function() { return findChild(indicators, identifier+"-delegate") !== undefined }, true);
             var item = findChild(indicators, identifier+"-delegate");
+            verify(item !== null);
 
             item.enabled = false;
         }

=== modified file 'tests/qmltests/Panel/tst_MenuContent.qml'
--- tests/qmltests/Panel/tst_MenuContent.qml	2014-09-09 15:10:52 +0000
+++ tests/qmltests/Panel/tst_MenuContent.qml	2014-10-14 14:19:22 +0000
@@ -26,14 +26,6 @@
     width: units.gu(40)
     height: units.gu(70)
 
-    property var indicator_status: {
-        'indicator-fake1-page': { 'started': false, 'reset': 0 },
-        'indicator-fake2-page': { 'started': false, 'reset': 0 },
-        'indicator-fake3-page': { 'started': false, 'reset': 0 },
-        'indicator-fake4-page': { 'started': false, 'reset': 0 },
-        'indicator-fake5-page': { 'started': false, 'reset': 0 }
-    }
-
     // Dummy objects
     Item { id: greeter }
     Item { id: handle }

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-10-13 15:42:40 +0000
+++ tests/qmltests/tst_Shell.qml	2014-10-14 14:19:22 +0000
@@ -65,6 +65,8 @@
         property bool itemDestroyed: false
         sourceComponent: Component {
             Shell {
+                property string indicatorProfile: "phone"
+
                 Component.onDestruction: {
                     shellLoader.itemDestroyed = true;
                 }

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2014-10-13 15:42:15 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2014-10-14 14:19:22 +0000
@@ -61,6 +61,8 @@
             property bool itemDestroyed: false
             sourceComponent: Component {
                 Shell {
+                    property string indicatorProfile: "phone"
+
                     Component.onDestruction: {
                         shellLoader.itemDestroyed = true
                     }

=== modified file 'tests/qmltests/tst_TabletShell.qml'
--- tests/qmltests/tst_TabletShell.qml	2014-10-09 13:05:21 +0000
+++ tests/qmltests/tst_TabletShell.qml	2014-10-14 14:19:22 +0000
@@ -57,6 +57,8 @@
         property bool itemDestroyed: false
         sourceComponent: Component {
             Shell {
+                property string indicatorProfile: "phone"
+
                 Component.onDestruction: {
                     shellLoader.itemDestroyed = true
                 }