git.iko.soy/unity8
on xenial help sign in
Don't register Mir as both singleton and uncreatable.
6f6e499Andrea Azzarone
tests/mocks/Unity/Application/plugin.cpp−2
compare with xenial
unifiedsplit
@@ -90,8 +90,6 @@ void FakeUnityApplicationQmlPlugin::registerTypes(const char *uri)
90 qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
90 qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
91 qmlRegisterSingletonType<MirMock>(uri, 0, 1, "Mir", mirSingleton);
91 qmlRegisterSingletonType<MirMock>(uri, 0, 1, "Mir", mirSingleton);
92 qmlRegisterSingletonType<SurfaceManager>(uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
92 qmlRegisterSingletonType<SurfaceManager>(uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
93−
94− qmlRegisterUncreatableType<Mir>(uri, 0, 1, "Mir", "Mir provides enum values, it can't be instantiated");
95}
93}
96
94
97void FakeUnityApplicationQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
95void FakeUnityApplicationQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)