Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	configure.exe
	tools/qdoc3/htmlgenerator.cpp
	tools/qdoc3/tree.cpp

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;
     }
 };