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

Disable signing when using debug deployment method.

Browse Source 
The debug deployment method can't be used to create APKs that can be
published on Android markets.

Change-Id: I0539e1e7bcbf5935d74f9ee93cadc8b296a94664
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2014-07-22 13:41:15 +03:00
parent 9f4322a398
commit d50e15f611
3 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/android/androidbuildapkwidget.cpp
View File

@@ -101,6 +101,9 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
connect(m_ui->ministroOption, SIGNAL(clicked()), SLOT(setMinistro())); connect(m_ui->ministroOption, SIGNAL(clicked()), SLOT(setMinistro()));
connect(m_ui->temporaryQtOption, SIGNAL(clicked()), SLOT(setDeployLocalQtLibs())); connect(m_ui->temporaryQtOption, SIGNAL(clicked()), SLOT(setDeployLocalQtLibs()));
connect(m_ui->bundleQtOption, SIGNAL(clicked()), SLOT(setBundleQtLibs())); connect(m_ui->bundleQtOption, SIGNAL(clicked()), SLOT(setBundleQtLibs()));
connect(m_ui->ministroOption, SIGNAL(clicked()), SLOT(updateDebugDeploySigningWarning()));
connect(m_ui->temporaryQtOption, SIGNAL(clicked()), SLOT(updateDebugDeploySigningWarning()));
connect(m_ui->bundleQtOption, SIGNAL(clicked()), SLOT(updateDebugDeploySigningWarning()));
connect(m_ui->openPackageLocationCheckBox, SIGNAL(toggled(bool)), connect(m_ui->openPackageLocationCheckBox, SIGNAL(toggled(bool)),
this, SLOT(openPackageLocationCheckBoxToggled(bool))); this, SLOT(openPackageLocationCheckBoxToggled(bool)));
@@ -123,6 +126,7 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
this, SLOT(updateSigningWarning())); this, SLOT(updateSigningWarning()));
updateSigningWarning(); updateSigningWarning();
updateDebugDeploySigningWarning();
QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(step->target()->kit()); QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(step->target()->kit());
m_ui->temporaryQtOption->setVisible(qt->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0)); m_ui->temporaryQtOption->setVisible(qt->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0));
} }
@@ -236,3 +240,17 @@ void AndroidBuildApkWidget::updateSigningWarning()
} }
} }
void AndroidBuildApkWidget::updateDebugDeploySigningWarning()
{
if (m_step->deployAction() == AndroidBuildApkStep::DebugDeployment) {
m_ui->signingDebugDeployError->setVisible(true);
m_ui->signingDebugDeployErrorIcon->setVisible(true);
m_ui->signPackageCheckBox->setChecked(false);
m_ui->signPackageCheckBox->setEnabled(false);
} else {
m_ui->signingDebugDeployError->setVisible(false);
m_ui->signingDebugDeployErrorIcon->setVisible(false);
m_ui->signPackageCheckBox->setEnabled(true);
}
}

1
src/plugins/android/androidbuildapkwidget.h
View File

@@ -63,6 +63,7 @@ private slots:
void certificatesAliasComboBoxCurrentIndexChanged(const QString &alias); void certificatesAliasComboBoxCurrentIndexChanged(const QString &alias);
void certificatesAliasComboBoxActivated(const QString &alias); void certificatesAliasComboBoxActivated(const QString &alias);
void updateSigningWarning(); void updateSigningWarning();
void updateDebugDeploySigningWarning();
void openPackageLocationCheckBoxToggled(bool checked); void openPackageLocationCheckBoxToggled(bool checked);
void verboseOutputCheckBoxToggled(bool checked); void verboseOutputCheckBoxToggled(bool checked);
void updateKeyStorePath(const QString &path); void updateKeyStorePath(const QString &path);

33
src/plugins/android/androidbuildapkwidget.ui
View File

@@ -123,6 +123,39 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="signingDebugDeployErrorIcon">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="signingDebugDeployError">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Signing an APK that uses &quot;Deploy local Qt libraries&quot; is not allowed</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>