1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h
index 345389e987..03311345a2 100644
--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@@ -36,10 +36,6 @@
 
 #include <QtGui/qpixmap.h>
 
-#ifdef Q_TEST_QPIXMAPCACHE
-#include <QtCore/qpair.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 
@@ -52,12 +48,18 @@ public:
     public:
         Key();
         Key(const Key &other);
+#ifdef Q_COMPILER_RVALUE_REFS
+        Key(Key &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Q_NULLPTR; }
+        Key &operator =(Key &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+#endif
         ~Key();
         bool operator ==(const Key &key) const;
         inline bool operator !=(const Key &key) const
         { return !operator==(key); }
         Key &operator =(const Key &other);
 
+        void swap(Key &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+
     private:
         KeyData *d;
         friend class QPMCache;
@@ -80,7 +82,6 @@ public:
 #ifdef Q_TEST_QPIXMAPCACHE
     static void flushDetachedPixmaps();
     static int totalUsed();
-    static QList< QPair<QString,QPixmap> > allPixmaps();
 #endif
 };