Merge remote-tracking branch 'origin/4.14'

Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473

src/plugins/android/androidcreatekeystorecertificate.cpp

@@ -54,6 +54,14 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare
             this, &AndroidCreateKeystoreCertificate::checkCertificateAlias);
     connect(ui->countryLineEdit, &QLineEdit::textChanged,
             this, &AndroidCreateKeystoreCertificate::checkCountryCode);
+    connect(ui->keystoreShowPassCheckBox, &QCheckBox::stateChanged,
+            this, &AndroidCreateKeystoreCertificate::keystoreShowPassStateChanged);
+    connect(ui->certificateShowPassCheckBox, &QCheckBox::stateChanged,
+            this, &AndroidCreateKeystoreCertificate::certificateShowPassStateChanged);
+    connect(ui->samePasswordCheckBox, &QCheckBox::stateChanged,
+            this, &AndroidCreateKeystoreCertificate::samePasswordStateChanged);
+    connect(ui->buttonBox, &QDialogButtonBox::accepted,
+            this, &AndroidCreateKeystoreCertificate::buttonBoxAccepted);
     connect(ui->buttonBox, &QDialogButtonBox::rejected,
             this, &QDialog::reject);
     connect(ui->keystorePassLineEdit,
@@ -144,19 +152,19 @@ bool AndroidCreateKeystoreCertificate::checkCountryCode()
     return true;
 }
 
-void AndroidCreateKeystoreCertificate::on_keystoreShowPassCheckBox_stateChanged(int state)
+void AndroidCreateKeystoreCertificate::keystoreShowPassStateChanged(int state)
 {
     ui->keystorePassLineEdit->setEchoMode(state == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password);
     ui->keystoreRetypePassLineEdit->setEchoMode(ui->keystorePassLineEdit->echoMode());
 }
 
-void AndroidCreateKeystoreCertificate::on_certificateShowPassCheckBox_stateChanged(int state)
+void AndroidCreateKeystoreCertificate::certificateShowPassStateChanged(int state)
 {
     ui->certificatePassLineEdit->setEchoMode(state == Qt::Checked ? QLineEdit::Normal : QLineEdit::Password);
     ui->certificateRetypePassLineEdit->setEchoMode(ui->certificatePassLineEdit->echoMode());
 }
 
-void AndroidCreateKeystoreCertificate::on_buttonBox_accepted()
+void AndroidCreateKeystoreCertificate::buttonBoxAccepted()
 {
     if (!validateUserInput())
         return;
@@ -200,7 +208,7 @@ void AndroidCreateKeystoreCertificate::on_buttonBox_accepted()
     accept();
 }
 
-void AndroidCreateKeystoreCertificate::on_samePasswordCheckBox_stateChanged(int state)
+void AndroidCreateKeystoreCertificate::samePasswordStateChanged(int state)
 {
     if (state == Qt::Checked) {
         ui->certificatePassLineEdit->setDisabled(true);

src/plugins/android/androidcreatekeystorecertificate.h

@@ -61,10 +61,10 @@ private:
     bool checkCountryCode();
 
 private slots:
-    void on_keystoreShowPassCheckBox_stateChanged(int state);
-    void on_certificateShowPassCheckBox_stateChanged(int state);
-    void on_buttonBox_accepted();
-    void on_samePasswordCheckBox_stateChanged(int state);
+    void keystoreShowPassStateChanged(int state);
+    void certificateShowPassStateChanged(int state);
+    void buttonBoxAccepted();
+    void samePasswordStateChanged(int state);
 
 private:
     bool validateUserInput();

src/plugins/android/androidrunconfiguration.h

@@ -53,9 +53,6 @@ public:
     void fromMap(const QVariantMap &map) override;
     void toMap(QVariantMap &map) const override;
 
-signals:
-    void changed();
-
 private:
     QStringList m_value;
     QString m_label;

src/plugins/android/androidsettingswidget.cpp

@@ -327,7 +327,8 @@ void AndroidSettingsWidget::updateNdkList()
 
 void AndroidSettingsWidget::addCustomNdkItem()
 {
-    const QString homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).first();
+    const QString homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation)
+            .constFirst();
     const QString ndkPath = QFileDialog::getExistingDirectory(this, tr("Select an NDK"), homePath);
 
     if (m_androidConfig.isValidNdk(ndkPath)) {