From 4fe5f175f07212194a8aa64c9d4622f8b8c44e71 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
Date: Tue, 25 May 2010 11:54:28 +0300
Subject: Fix for QRuntimePixmapData serial number setting.

Generate serial number in the same way as X11 and Mac.
Fixes OSX x64 build problem.

Reviewed-by: Jason Barron
---
 src/gui/painting/qgraphicssystem_runtime.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index ceb16ed..1c5d944 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+static int qt_pixmap_serial = 0;
+
 #define READBACK(f)                                         \
     m_graphicsSystem->decreaseMemoryUsage(memoryUsage());   \
     f                                                       \
@@ -89,7 +91,7 @@ private:
 QRuntimePixmapData::QRuntimePixmapData(const QRuntimeGraphicsSystem *gs, PixelType type)
         : QPixmapData(type, RuntimeClass), m_graphicsSystem(gs)
 {
-    setSerialNumber((int)this);
+    setSerialNumber(++qt_pixmap_serial);
 }
 
 QRuntimePixmapData::~QRuntimePixmapData()
-- 
cgit v0.12