aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2020-02-14 16:41:28 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2020-02-15 10:13:24 +0100
commit55546991e24ca6799709cbe0171b9ab87216c35f (patch)
treede34d8392bb5655ef3e35a77c423ab0b8284d906
parentee95f0e6830a504574ef5fa54b44a11b13d5a8ae (diff)
Rearrange QQuickPixmapKey operator==
...to do the comparisons in the same order as the variables are stored. Change-Id: I5faa1daa84757b94993c3135ddfc9a3fd6c10ea6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--src/quick/util/qquickpixmapcache.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index 6a34169fce..8846edcd44 100644
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -1026,8 +1026,11 @@ public:
inline bool operator==(const QQuickPixmapKey &lhs, const QQuickPixmapKey &rhs)
{
- return *lhs.region == *rhs.region && *lhs.size == *rhs.size && *lhs.url == *rhs.url &&
- lhs.options == rhs.options && lhs.frame == rhs.frame;
+ return *lhs.url == *rhs.url &&
+ *lhs.region == *rhs.region &&
+ *lhs.size == *rhs.size &&
+ lhs.frame == rhs.frame &&
+ lhs.options == rhs.options;
}
inline uint qHash(const QQuickPixmapKey &key)