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

Android: fix manifest editor appending lib_name meta-data

Browse Source 
The manifest editor is always adding the meta-data part for
"android.app.lib_name" because parseMetaData() is wrongfully
returning false.

Change-Id: Ic5f1971e98f213b6fe517bf6605120b21ca51508
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-03-24 20:12:54 +02:00
parent e0e5334d83
commit 8f8b1b3d9d
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1121,8 +1121,7 @@ bool AndroidManifestEditorWidget::parseMetaData(QXmlStreamReader &reader, QXmlSt
{ {
Q_ASSERT(reader.isStartElement()); Q_ASSERT(reader.isStartElement());
const int parseItemsCount = 2; bool found = false;
int counter = 0;
QXmlStreamAttributes attributes = reader.attributes(); QXmlStreamAttributes attributes = reader.attributes();
QXmlStreamAttributes result; QXmlStreamAttributes result;
QStringList keys; QStringList keys;
@@ -1132,13 +1131,13 @@ bool AndroidManifestEditorWidget::parseMetaData(QXmlStreamReader &reader, QXmlSt
keys = QStringList("android:value"); keys = QStringList("android:value");
values = QStringList(m_targetLineEdit->currentText()); values = QStringList(m_targetLineEdit->currentText());
result = modifyXmlStreamAttributes(attributes, keys, values); result = modifyXmlStreamAttributes(attributes, keys, values);
++counter; found = true;
} else if (attributes.value(QLatin1String("android:name")) } else if (attributes.value(QLatin1String("android:name"))
== QLatin1String("android.app.extract_android_style")) { == QLatin1String("android.app.extract_android_style")) {
keys = QStringList("android:value"); keys = QStringList("android:value");
values = QStringList(m_styleExtractMethod->currentText()); values = QStringList(m_styleExtractMethod->currentText());
result = modifyXmlStreamAttributes(attributes, keys, values); result = modifyXmlStreamAttributes(attributes, keys, values);
++counter; found = true;
} else { } else {
result = attributes; result = attributes;
} }
@@ -1151,7 +1150,7 @@ bool AndroidManifestEditorWidget::parseMetaData(QXmlStreamReader &reader, QXmlSt
while (!reader.atEnd()) { while (!reader.atEnd()) {
if (reader.isEndElement()) { if (reader.isEndElement()) {
writer.writeCurrentToken(reader); writer.writeCurrentToken(reader);
return counter == parseItemsCount; return found;
} else if (reader.isStartElement()) { } else if (reader.isStartElement()) {
parseUnknownElement(reader, writer); parseUnknownElement(reader, writer);
} else { } else {
@@ -1159,7 +1158,7 @@ bool AndroidManifestEditorWidget::parseMetaData(QXmlStreamReader &reader, QXmlSt
} }
reader.readNext(); reader.readNext();
} }
return counter == parseItemsCount; // should never be reached return found; // should never be reached
} }
void AndroidManifestEditorWidget::parseUsesSdk(QXmlStreamReader &reader, QXmlStreamWriter & writer) void AndroidManifestEditorWidget::parseUsesSdk(QXmlStreamReader &reader, QXmlStreamWriter & writer)