2cbd23d · unity8 · git.iko.soy

plugins/LightDM/plugin.cpp+1−1

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

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

83

84 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"));

86

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

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

qml/Greeter/SessionsList.qml+1−1

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

65

66 onDelegateClicked: {

67 sessionSelected(sessionsList.model.data(index,

68− LightDMService.sessionRoles.DisplayRole));

68+ LightDMService.sessionRoles.KeyRole));

69 }

70 }

71 }

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

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

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

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

74 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");

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

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

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