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

Respect the setting of the version code via the pro file

Browse Source 
As a pro file can now set the version name and code via the pro file,
this enables support for the code part as it will default to a
variable (similar to the version name). Therefore we need to use
QLineEdit for this over QSpinBox so that it is kept intact.

Done-with: Markus Maier <markus.maier@rosenberger.de>
Change-Id: I0524a90dc94888c11365164c41259a934caffa1c
Reviewed-by: Markus Maier <markus.maier@rosenberger.de>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Andy Shaw
2018-10-16 08:33:37 +02:00
parent 05c7abf00e
commit 986ce6fb98
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -170,12 +170,8 @@ void AndroidManifestEditorWidget::initializePage()
formLayout->addRow(QString(), warningRow); formLayout->addRow(QString(), warningRow);
m_versionCodeLineEdit = new QLineEdit(packageGroupBox);
m_versionCode = new QSpinBox(packageGroupBox); formLayout->addRow(tr("Version code:"), m_versionCodeLineEdit);
m_versionCode->setMaximum(std::numeric_limits<int>::max());
m_versionCode->setValue(1);
m_versionCode->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
formLayout->addRow(tr("Version code:"), m_versionCode);
m_versionNameLinedit = new QLineEdit(packageGroupBox); m_versionNameLinedit = new QLineEdit(packageGroupBox);
formLayout->addRow(tr("Version name:"), m_versionNameLinedit); formLayout->addRow(tr("Version name:"), m_versionNameLinedit);
@@ -201,8 +197,8 @@ void AndroidManifestEditorWidget::initializePage()
connect(m_packageNameLineEdit, &QLineEdit::textEdited, connect(m_packageNameLineEdit, &QLineEdit::textEdited,
this, &AndroidManifestEditorWidget::setPackageName); this, &AndroidManifestEditorWidget::setPackageName);
connect(m_versionCode, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), connect(m_versionCodeLineEdit, &QLineEdit::textEdited,
this, &AndroidManifestEditorWidget::setDirty); this, setDirtyFunc);
connect(m_versionNameLinedit, &QLineEdit::textEdited, connect(m_versionNameLinedit, &QLineEdit::textEdited,
this, setDirtyFunc); this, setDirtyFunc);
connect(m_androidMinSdkVersion, connect(m_androidMinSdkVersion,
@@ -760,7 +756,7 @@ void AndroidManifestEditorWidget::syncToWidgets(const QDomDocument &doc)
m_stayClean = true; m_stayClean = true;
QDomElement manifest = doc.documentElement(); QDomElement manifest = doc.documentElement();
m_packageNameLineEdit->setText(manifest.attribute(QLatin1String("package"))); m_packageNameLineEdit->setText(manifest.attribute(QLatin1String("package")));
m_versionCode->setValue(manifest.attribute(QLatin1String("android:versionCode")).toInt()); m_versionCodeLineEdit->setText(manifest.attribute(QLatin1String("android:versionCode")));
m_versionNameLinedit->setText(manifest.attribute(QLatin1String("android:versionName"))); m_versionNameLinedit->setText(manifest.attribute(QLatin1String("android:versionName")));
QDomElement usesSdkElement = manifest.firstChildElement(QLatin1String("uses-sdk")); QDomElement usesSdkElement = manifest.firstChildElement(QLatin1String("uses-sdk"));
@@ -917,7 +913,7 @@ void AndroidManifestEditorWidget::parseManifest(QXmlStreamReader &reader, QXmlSt
<< QLatin1String("android:versionName"); << QLatin1String("android:versionName");
QStringList values = QStringList() QStringList values = QStringList()
<< m_packageNameLineEdit->text() << m_packageNameLineEdit->text()
<< QString::number(m_versionCode->value()) << m_versionCodeLineEdit->text()
<< m_versionNameLinedit->text(); << m_versionNameLinedit->text();
QXmlStreamAttributes result = modifyXmlStreamAttributes(attributes, keys, values); QXmlStreamAttributes result = modifyXmlStreamAttributes(attributes, keys, values);

2
src/plugins/android/androidmanifesteditorwidget.h
View File

@@ -163,7 +163,7 @@ private:
QLineEdit *m_packageNameLineEdit; QLineEdit *m_packageNameLineEdit;
QLabel *m_packageNameWarningIcon; QLabel *m_packageNameWarningIcon;
QLabel *m_packageNameWarning; QLabel *m_packageNameWarning;
QSpinBox *m_versionCode; QLineEdit *m_versionCodeLineEdit;
QLineEdit *m_versionNameLinedit; QLineEdit *m_versionNameLinedit;
QComboBox *m_androidMinSdkVersion; QComboBox *m_androidMinSdkVersion;
QComboBox *m_androidTargetSdkVersion; QComboBox *m_androidTargetSdkVersion;