Fix tryShell starting with full user list instead of single user
commit62feeb8644e91b749936e85e7ba4d369002fa3c0
authorMichael Terry <michael.terry@canonical.com>
dateFri 9 Sep 2016, 11:53 (10 years ago)
parent5b98027
qml/Greeter/LoginList.qml+1
@@ -17,6 +17,7 @@
1717import QtQuick 2.4
1818import QtGraphicalEffects 1.0
1919import Ubuntu.Components 1.3
20+import LightDM 0.1 as LightDM
2021import "../Components"
2122
2223StyledItem {
qml/Greeter/WideView.qml+1
@@ -16,6 +16,7 @@
1616
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3
19+import LightDM 0.1 as LightDM
1920
2021FocusScope {
2122 id: root
tests/mocks/AccountsService/AccountsService.cpp−1
@@ -37,7 +37,6 @@ AccountsService::AccountsService(QObject* parent)
3737 m_hereLicensePath(""),
3838 m_usersModel(new UsersModel(this))
3939{
40− QLightDM::MockController::instance()->setUserMode("full");
4140}
4241
4342QString AccountsService::user() const
tests/mocks/liblightdm/MockUsersModel.cpp+2−2
@@ -65,8 +65,8 @@ UsersModel::UsersModel(QObject *parent)
6565 roles[UidRole] = "uid";
6666 setRoleNames(roles);
6767
68− connect(MockController::instance(), SIGNAL(userModeChanged()),
69− this, SLOT(resetEntries()));
68+ connect(MockController::instance(), &MockController::userModeChanged,
69+ this, &UsersModel::resetEntries);
7070 resetEntries();
7171}
7272