diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-05 08:09:00 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-05 08:09:00 (GMT) |
| commit | bb587db95d7c20344c0bf06a1f080c0a2e4a9250 (patch) | |
| tree | 50c4615c0c5908bb5a26c1a3ee121dd1f7f070be /tests/benchmarks/qpixmapcache/tst_qpixmapcache.cpp | |
| parent | f26f5b230e614faecce33cf52af0a0d62dcaddaa (diff) | |
| parent | 555018baf3115cb2587d2217bf1a5b8f49564ad2 (diff) | |
| download | Qt-bb587db95d7c20344c0bf06a1f080c0a2e4a9250.zip Qt-bb587db95d7c20344c0bf06a1f080c0a2e4a9250.tar.gz Qt-bb587db95d7c20344c0bf06a1f080c0a2e4a9250.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tests/benchmarks/qpixmapcache/tst_qpixmapcache.cpp')
| -rw-r--r-- | tests/benchmarks/qpixmapcache/tst_qpixmapcache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/qpixmapcache/tst_qpixmapcache.cpp b/tests/benchmarks/qpixmapcache/tst_qpixmapcache.cpp index f3c1134..9dafff5 100644 --- a/tests/benchmarks/qpixmapcache/tst_qpixmapcache.cpp +++ b/tests/benchmarks/qpixmapcache/tst_qpixmapcache.cpp @@ -156,9 +156,9 @@ struct styleStruct { int height; bool operator==(const styleStruct &str) const { - return str.key == key && str.state == state && str.direction == direction + return str.state == state && str.direction == direction && str.complex == complex && str.palette == palette && str.width == width - && str.height == height; + && str.height == height && str.key == key; } }; |