diff options
author | Andy Shaw <andy.shaw@qt.io> | 2021-05-03 12:28:58 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-27 13:39:21 +0000 |
commit | 41f6826546f274805a6e96927b0c99eda0045358 (patch) | |
tree | 28b1b7c1e60276bd116489e3e2dc23a1c154ce28 | |
parent | 716303c35a537bc38ddbdfd80ba23a884abf6978 (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
Change-Id: I2a795bff7ce683eca521b3a987293b3320accb6a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit a8a6558a84471a939d2d23977e394acadd2fcc6a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/tools/androiddeployqt/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 2044f28023..ffa0a56a32 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2260,9 +2260,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; |