Merge master and fix conflicts

1 files changed, 9 insertions, 2 deletions

diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp

index bb329699..9a920d1d 100644
--- a/src/LoginPage.cpp
+++ b/src/LoginPage.cpp
@@ -16,6 +16,7 @@
  */
 
 #include <QDesktopServices>
+#include <QLabel>
 #include <QPainter>
 #include <QStyleOption>
 
@@ -118,7 +119,7 @@ LoginPage::LoginPage(QWidget *parent)
         deviceName_->setLabel(tr("Device name"));
         deviceName_->setToolTip(
           tr("A name for this device, which will be shown to others, when verifying your devices. "
-             "If none is provided, a random string is used for privacy purposes."));
+             "If none is provided a default is used."));
 
         serverInput_ = new TextField(this);
         serverInput_->setLabel("Homeserver address");
@@ -132,7 +133,7 @@ LoginPage::LoginPage(QWidget *parent)
 
         form_layout_->addLayout(matrixidLayout_);
         form_layout_->addWidget(password_input_);
-        form_layout_->addWidget(deviceName_, Qt::AlignHCenter, nullptr);
+        form_layout_->addWidget(deviceName_, Qt::AlignHCenter);
         form_layout_->addLayout(serverLayout_);
 
         button_layout_ = new QHBoxLayout();
@@ -180,6 +181,12 @@ LoginPage::LoginPage(QWidget *parent)
 }
 
 void
+LoginPage::loginError(const QString &msg)
+{
+        error_label_->setText(msg);
+}
+
+void
 LoginPage::onMatrixIdEntered()
 {
         error_label_->setText("");