Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60

Conflicts:
	src/s60installs/bwins/QtGuiu.def

3 files changed, 13 insertions, 0 deletions

diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index d8809ef..ce7f450 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -165,12 +165,16 @@ public:
     QRect rect() const;
 
     int depth() const;
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numColors() const;
+#endif
     int colorCount() const;
 
     QRgb color(int i) const;
     void setColor(int i, QRgb c);
+#ifdef QT_DEPRECATED
     QT_DEPRECATED void setNumColors(int);
+#endif
     void setColorCount(int);
 
     bool allGray() const;
@@ -178,7 +182,9 @@ public:
 
     uchar *bits();
     const uchar *bits() const;
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numBytes() const;
+#endif
     int byteCount() const;
 
     uchar *scanLine(int);
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index d95b4ee..e02b0d6 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -185,7 +185,9 @@ public:
     const uchar *qwsBits() const;
     int qwsBytesPerLine() const;
     QRgb *clut() const;
+#ifdef QT_DEPRECATED
     QT_DEPRECATED int numCols() const;
+#endif
     int colorCount() const;
 #elif defined(Q_WS_MAC)
     Qt::HANDLE macQDHandle() const;
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index b0b7d72..b7b29d7 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -424,6 +424,11 @@ QPixmapCache::KeyData* QPMCache::getKeyData(QPixmapCache::Key *key)
 
 Q_GLOBAL_STATIC(QPMCache, pm_cache)
 
+int Q_AUTOTEST_EXPORT q_QPixmapCache_keyHashSize()
+{
+    return pm_cache()->size();
+}
+
 QPixmapCacheEntry::~QPixmapCacheEntry()
 {
     pm_cache()->releaseKey(key);