Fix bad merge
commit6068ba9e415767c464098d18ced41bbbd327082d
authorDaniel d'Andrada <daniel.dandrada@canonical.com>
dateThu 1 Dec 2016, 09:38 (10 years ago)
parentf1dcc66
tests/mocks/Unity/Application/plugin.cpp+1−2
@@ -36,8 +36,7 @@ QObject* applicationManagerSingleton(QQmlEngine*, QJSEngine*)
3636
3737QObject* mirSingleton(QQmlEngine*, QJSEngine*)
3838{
39− createUnityApplicationSharedSingletons();
40− return MirMock::instance();
39+ return new MirMock;
4140}
4241} // anonymous namespace
4342