summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2021-05-03 12:28:58 +0200
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2021-05-14 08:12:09 +0000
commita8a6558a84471a939d2d23977e394acadd2fcc6a (patch)
tree31d7e9e1704ba922c4461c0c846b2552200b0198 /src/tools
parent7c4363ba4c1b7e0618fc277c0e60cef3242917c0 (diff)
Allow for arguments that have an equals as part of it
Since you can pass a define to org.gradle.jvmargs that can have the name=value approach, then we need to ensure that this is accounted for. Task-number: QTBUG-88989 Pick-to: 6.1 5.15 Change-Id: I2a795bff7ce683eca521b3a987293b3320accb6a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/androiddeployqt/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 462315fcf1..20770f9753 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -2363,9 +2363,9 @@ static GradleProperties readGradleProperties(const QString &path)
if (line.trimmed().startsWith('#'))
continue;
- QList<QByteArray> prop(line.split('='));
- if (prop.size() > 1)
- properties[prop.at(0).trimmed()] = prop.at(1).trimmed();
+ const int idx = line.indexOf('=');
+ if (idx > -1)
+ properties[line.left(idx).trimmed()] = line.mid(idx + 1).trimmed();
}
file.close();
return properties;