From a8a6558a84471a939d2d23977e394acadd2fcc6a Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Mon, 3 May 2021 12:28:58 +0200 Subject: [PATCH] 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 --- src/tools/androiddeployqt/main.cpp | 6 +++--- 1 file 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 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;