From 158dee7eb69112ed8794b2631c9afc75fbcfe95f Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 25 Jun 2020 13:37:29 +0200
Subject: [PATCH] Android: Move connections out of .ui

... and make them compile when using Qt 6 uic.

Change-Id: If5a9a052c62aa2641c60378bb26916325aed628e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../androidcreatekeystorecertificate.cpp      |  6 ++++
 .../androidcreatekeystorecertificate.ui       | 34 -------------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp
index 06b847e398b..32fa5fddde5 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.cpp
+++ b/src/plugins/android/androidcreatekeystorecertificate.cpp
@@ -54,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()
diff --git a/src/plugins/android/androidcreatekeystorecertificate.ui b/src/plugins/android/androidcreatekeystorecertificate.ui
index a6b6c383f19..4c62e9e9414 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.ui
+++ b/src/plugins/android/androidcreatekeystorecertificate.ui
@@ -329,38 +329,4 @@
   <tabstop>countryLineEdit</tabstop>
  </tabstops>
  <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>AndroidCreateKeystoreCertificate</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>320</x>
-     <y>422</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>keystorePassLineEdit</sender>
-   <signal>editingFinished()</signal>
-   <receiver>keystoreRetypePassLineEdit</receiver>
-   <slot>setFocus()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>201</x>
-     <y>48</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>213</x>
-     <y>75</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
 </ui>