feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Move connections out of .ui

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

Change-Id: If5a9a052c62aa2641c60378bb26916325aed628e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2020-06-25 13:37:29 +02:00
parent b96b0e4230
commit 158dee7eb6
2 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidcreatekeystorecertificate.cpp
View File

@@ -54,6 +54,12 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare
this, &AndroidCreateKeystoreCertificate::checkCertificateAlias); this, &AndroidCreateKeystoreCertificate::checkCertificateAlias);
connect(ui->countryLineEdit, &QLineEdit::textChanged, connect(ui->countryLineEdit, &QLineEdit::textChanged,
this, &AndroidCreateKeystoreCertificate::checkCountryCode); this, &AndroidCreateKeystoreCertificate::checkCountryCode);
connect(ui->buttonBox, &QDialogButtonBox::rejected,
this, &QDialog::reject);
connect(ui->keystorePassLineEdit,
&QLineEdit::editingFinished,
ui->keystoreRetypePassLineEdit,
QOverload<>::of(&QLineEdit::setFocus));
} }
AndroidCreateKeystoreCertificate::~AndroidCreateKeystoreCertificate() AndroidCreateKeystoreCertificate::~AndroidCreateKeystoreCertificate()

34
src/plugins/android/androidcreatekeystorecertificate.ui
View File

@@ -329,38 +329,4 @@
<tabstop>countryLineEdit</tabstop> <tabstop>countryLineEdit</tabstop>
</tabstops> </tabstops>
<resources/> <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> </ui>