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

Android: Use Utils::InfoLabel in AndroidBuildApk*

Browse Source 
Task-number: QTCREATORBUG-23346
Change-Id: Ie923d9e8f774613c1e9d0bb7dc1255acfce39cef
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Alessandro Portale
2019-12-13 00:06:34 +01:00
parent f5b92c865b
commit b250c879af
3 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,9 +42,9 @@
#include <qtsupport/qtkitinformation.h>
#include <utils/infolabel.h>
#include <utils/fancylineedit.h>
#include <utils/pathchooser.h>
#include <utils/utilsicons.h>
#include <QCheckBox>
#include <QComboBox>
@@ -156,13 +156,8 @@ QWidget *AndroidBuildApkWidget::createSignPackageGroup()
m_signPackageCheckBox = new QCheckBox(tr("Sign package"), group);
m_signPackageCheckBox->setChecked(m_step->signPackage());
m_signingDebugWarningIcon = new QLabel(group);
m_signingDebugWarningIcon->setSizePolicy(sizePolicy);
m_signingDebugWarningIcon->setPixmap(Icons::WARNING.pixmap());
m_signingDebugWarningIcon->hide();
m_signingDebugWarningLabel = new QLabel(tr("Signing a debug package"), group);
m_signingDebugWarningLabel->setSizePolicy(sizePolicy);
m_signingDebugWarningLabel = new Utils::InfoLabel(tr("Signing a debug package"),
Utils::InfoLabel::Warning, group);
m_signingDebugWarningLabel->hide();
auto certificateAliasLabel = new QLabel(tr("Certificate alias:"), group);
@@ -182,7 +177,6 @@ QWidget *AndroidBuildApkWidget::createSignPackageGroup()
horizontalLayout_2->addWidget(keystoreCreateButton);
auto horizontalLayout_3 = new QHBoxLayout;
horizontalLayout_3->addWidget(m_signingDebugWarningIcon);
horizontalLayout_3->addWidget(m_signingDebugWarningLabel);
horizontalLayout_3->addWidget(certificateAliasLabel);
horizontalLayout_3->addWidget(m_certificatesAliasComboBox);
@@ -356,7 +350,6 @@ void AndroidBuildApkWidget::updateSigningWarning()
{
bool nonRelease = m_step->buildConfiguration()->buildType() != BuildConfiguration::Release;
bool visible = m_step->signPackage() && nonRelease;
m_signingDebugWarningIcon->setVisible(visible);
m_signingDebugWarningLabel->setVisible(visible);
}