summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-03-31 09:24:04 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-03-31 07:50:45 +0000
commit92efbd613a7f1aa3f8b0f54beeb2ae77ca98812a (patch)
tree22bfeb0f227419fedaecb36a82efeb4b1a1f75d7
parent945d8fdb118fc225e271a0507d9958e2aafbea18 (diff)
Qt Designer: Fix hang in PropertySheetIconValue::operator<()v5.9.0-beta1
Add missing iterator increments, amending change 4ca6d6bfb0071aa03744e292f688ef69772a5a47. Task-number: QTBUG-59841 Change-Id: I89d293b813abefc5441edfc0dfd5a4cca4122af0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r--src/designer/src/lib/shared/qdesigner_utils.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp
index cab289515..fc0e203a0 100644
--- a/src/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/src/designer/src/lib/shared/qdesigner_utils.cpp
@@ -352,6 +352,8 @@ namespace qdesigner_internal
return true;
if (crc > 0)
return false;
+ ++itThis;
+ ++itOther;
}
if (itOther != itOtherEnd)
return true;