← Back to branch summary

~mterry/unity8/greeter-misc-cleanups

« back to all changes in this revision

Viewing changes to plugins/LightDM/plugin.cpp

  • Committer: Michael Terry
  • Date: 2014-07-28 11:44:58 UTC
  • mfrom: (981.1.18 locking-hash)
  • Revision ID: michael.terry@canonical.com-20140728114458-o6e5nph059ruh7oi
Merge in locking-hash

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/LightDM/plugin.cpp
69
69
    qmlRegisterType<UserMetricsOutput::ColorTheme>();
70
70
 
71
71
    Q_ASSERT(uri == QLatin1String("LightDM"));
 
72
    qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
 
73
    qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
72
74
    qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
73
75
    qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
74
76
    qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");