summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-06-03 13:16:18 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-04 05:16:43 +0000
commit6cb5c079780c4bb9a7549349562acaaa15856387 (patch)
treeee5367b3bc97cf3834c171f1405b535df7f3d94f
parent9b85fb68dbfc4b1c2598b32979ca8c7f8021ff04 (diff)
Qt Designer: Fix a crash when reading a device profile
QString::operator()[] no longer returns a char ref, so, isEmpty() must be checked first. Change-Id: I22d9787bf3f032104fced0608d32cb27799a4bd7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit caef0146a7ee66cd3b5dccdcec52a881f9b05a7f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/shared/deviceskin/deviceskin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index 84b0da633..9165e8c1e 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -175,7 +175,7 @@ bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMess
QString line = ts.readLine();
if ( line.isNull() )
break;
- if ( line[0] != QLatin1Char('#') && !line.isEmpty() ) {
+ if (!line.isEmpty() && line.at(0) != u'#') {
int eq = line.indexOf(QLatin1Char('='));
if ( eq >= 0 ) {
const QString key = line.left(eq);