diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/image/qpixmap.h
--- a/src/gui/image/qpixmap.h	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/gui/image/qpixmap.h	Tue Feb 02 00:43:10 2010 +0200
@@ -185,7 +185,10 @@
     const uchar *qwsBits() const;
     int qwsBytesPerLine() const;
     QRgb *clut() const;
-    int numCols() const;
+#ifdef QT_DEPRECATED
+    QT_DEPRECATED int numCols() const;
+#endif
+    int colorCount() const;
 #elif defined(Q_WS_MAC)
     Qt::HANDLE macQDHandle() const;
     Qt::HANDLE macQDAlphaHandle() const;