From 25f69fa54228f94c7312c5b699e37f6e20077835 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 20 Nov 2013 17:55:24 +0100 Subject: [PATCH] Android: Fix sign package behavior Ensure that the widget and the step's settings are in sync with each other. Also don't restore the sign state since that leads to a password prompt on restoring the project. Task-number: QTCREATORBUG-10835 Change-Id: I4c3ead74e8caa6c87096c13173530a9c8ccae6aa Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/android/androiddeployqtstep.cpp | 2 +- src/plugins/android/androiddeployqtwidget.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index e1d591eb720..2e42b763f58 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -388,7 +388,7 @@ bool AndroidDeployQtStep::fromMap(const QVariantMap &map) m_deployAction = AndroidDeployQtAction(map.value(QLatin1String(DeployActionKey), BundleLibrariesDeployment).toInt()); m_keystorePath = Utils::FileName::fromString(map.value(KeystoreLocationKey).toString()); - m_signPackage = map.value(SignPackageKey).toBool(); + m_signPackage = false; // don't restore this m_buildTargetSdk = map.value(BuildTargetSdkKey).toString(); m_verbose = map.value(VerboseOutputKey).toBool(); m_inputFile = map.value(InputFile).toString(); diff --git a/src/plugins/android/androiddeployqtwidget.cpp b/src/plugins/android/androiddeployqtwidget.cpp index a1dee1ddba9..7cc2e1561c2 100644 --- a/src/plugins/android/androiddeployqtwidget.cpp +++ b/src/plugins/android/androiddeployqtwidget.cpp @@ -82,9 +82,11 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step) } // signing + m_ui->signPackageCheckBox->setChecked(m_step->signPackage()); m_ui->KeystoreLocationLineEdit->setText(m_step->keystorePath().toUserOutput()); m_ui->signingDebugWarningIcon->hide(); m_ui->signingDebugWarningLabel->hide(); + signPackageCheckBoxToggled(m_step->signPackage()); m_ui->verboseOutputCheckBox->setChecked(m_step->verboseOutput()); m_ui->openPackageLocationCheckBox->setChecked(m_step->openPackageLocation());