2cbd23d · unity8 · git.iko.soy

git.iko.soy/unity8

Fix icons

commit2cbd23dc031a061caeb7dd1adcc24745523dbbcb authorJosh Arenson <joshua.arenson@canonical.com> dateThu 16 Jun 2016, 10:23 (10 years ago) parentc923993

3 files changed+3−3

compare with xenial

unifiedsplit

plugins/LightDM/plugin.cpp+1−1 qml/Greeter/SessionsList.qml+1−1 tests/mocks/LightDM/IntegratedLightDM/plugin.cpp+1−1

plugins/LightDM/plugin.cpp+1−1

@@ -82,7 +82,7 @@ void PLUGIN_CLASSNAME::registerTypes(const char *uri)

8282 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

8383

8484 qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);

85− qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));

85+ qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));

8686

8787 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

8888 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));

qml/Greeter/SessionsList.qml+1−1

@@ -65,7 +65,7 @@ Item {

6565

6666 onDelegateClicked: {

6767 sessionSelected(sessionsList.model.data(index,

68− LightDMService.sessionRoles.DisplayRole));

68+ LightDMService.sessionRoles.KeyRole));

6969 }

7070 }

7171 }

tests/mocks/LightDM/IntegratedLightDM/plugin.cpp+1−1

@@ -72,7 +72,7 @@ void LightDMPlugin::registerTypes(const char *uri)

7272 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

7373 qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);

7474 qmlRegisterSingletonType<MockSessionsModel>(uri, 0, 1, "Sessions", sessions_provider);

75− qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", "Type is not instantiable");

75+ qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", "Type is not instantiable");

7676 qmlRegisterSingletonType<MockUsersModel>(uri, 0, 1, "Users", users_provider);

7777 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");

7878 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);