1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp
index 82becd6d98..32fa5fddde 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.cpp
+++ b/src/plugins/android/androidcreatekeystorecertificate.cpp
@@ -30,6 +30,7 @@
 #include <utils/synchronousprocess.h>
 
 #include <QFileDialog>
+#include <QRegularExpression>
 #include <QMessageBox>
 
 using namespace Utils;
@@ -53,6 +54,12 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare
             this, &AndroidCreateKeystoreCertificate::checkCertificateAlias);
     connect(ui->countryLineEdit, &QLineEdit::textChanged,
             this, &AndroidCreateKeystoreCertificate::checkCountryCode);
+    connect(ui->buttonBox, &QDialogButtonBox::rejected,
+            this, &QDialog::reject);
+    connect(ui->keystorePassLineEdit,
+            &QLineEdit::editingFinished,
+            ui->keystoreRetypePassLineEdit,
+            QOverload<>::of(&QLineEdit::setFocus));
 }
 
 AndroidCreateKeystoreCertificate::~AndroidCreateKeystoreCertificate()
@@ -128,7 +135,7 @@ bool AndroidCreateKeystoreCertificate::checkCertificateAlias()
 
 bool AndroidCreateKeystoreCertificate::checkCountryCode()
 {
-    if (!ui->countryLineEdit->text().contains(QRegExp(QLatin1String("[A-Z]{2}")))) {
+    if (!ui->countryLineEdit->text().contains(QRegularExpression("[A-Z]{2}"))) {
         ui->infoLabel->setText(tr("<span style=\" color:#ff0000;\">Invalid country code</span>"));
         return false;
     }