1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow for arguments that have an equals as part of it

Browse Source 
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>
This commit is contained in:
Andy Shaw 2021-05-03 12:28:58 +02:00 committed by Qt Cherry-pick Bot
parent b552e75561
commit bb23bb8b1d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/androiddeployqt/main.cpp
View File

@ -2354,9 +2354,9 @@ static GradleProperties readGradleProperties(const QString &path)
if (line.trimmed().startsWith('#')) if (line.trimmed().startsWith('#'))
continue; continue;
QList<QByteArray> prop(line.split('=')); const int idx = line.indexOf('=');
if (prop.size() > 1) if (idx > -1)
properties[prop.at(0).trimmed()] = prop.at(1).trimmed(); properties[line.left(idx).trimmed()] = line.mid(idx + 1).trimmed();
} }
file.close(); file.close();
return properties; return properties;