summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edmundson <[email protected]>2016-12-14 11:38:15 +0000
committerDavid Edmundson <[email protected]>2016-12-14 11:38:15 +0000
commitbd7c9c76e411d5eda7f311a08408d1bd5c895f7a (patch)
tree734fa7c910c0e8cafa0b6e2068e0ad21933421b8
parent014e6d0f2feff34998481259502b088c0696923e (diff)
Merge Plasma/5.8 and undo the hiding of an option that is now re-supported
-rw-r--r--src/accountinfo.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/accountinfo.cpp b/src/accountinfo.cpp
index 26c39fa..0ad6624 100644
--- a/src/accountinfo.cpp
+++ b/src/accountinfo.cpp
@@ -58,11 +58,6 @@ AccountInfo::AccountInfo(AccountModel* model, QWidget* parent, Qt::WindowFlags f
connect(m_passwordEdit, SIGNAL(focused()), SLOT(changePassword()));
connect(m_passwordEdit, SIGNAL(textEdited(QString)), SLOT(changePassword()));
- //automaticLogin only sets a flag in AccountsService, which isn't supported by anything else
- //so hide it until the situation is different
- m_info->automaticLogin->setVisible(false);
- m_info->automaticLoginLabel->setVisible(false);
-
connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), SLOT(dataChanged(QModelIndex)));
m_info->face->setPopupMode(QToolButton::InstantPopup);
QMenu* menu = new QMenu(this);