git.iko.soy/unity8
on xenial help sign in
Fix bad merge
6068ba9Daniel d'Andrada
tests/mocks/Unity/Application/plugin.cpp+1−2
compare with xenial
unifiedsplit
@@ -36,8 +36,7 @@ QObject* applicationManagerSingleton(QQmlEngine*, QJSEngine*)
36
36
37QObject* mirSingleton(QQmlEngine*, QJSEngine*)
37QObject* mirSingleton(QQmlEngine*, QJSEngine*)
38{
38{
39− createUnityApplicationSharedSingletons();
40− return MirMock::instance();
39+ return new MirMock;
41}
40}
42} // anonymous namespace
41} // anonymous namespace
43
42