diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-05-25 08:54:28 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-05-25 08:57:03 (GMT) |
| commit | 4fe5f175f07212194a8aa64c9d4622f8b8c44e71 (patch) | |
| tree | 19b2dd02bac1f08afea880f243d11193854e2240 /src/gui | |
| parent | 5ed7cd99f160e565dedbafa585e6524e9a319e12 (diff) | |
| download | Qt-4fe5f175f07212194a8aa64c9d4622f8b8c44e71.zip Qt-4fe5f175f07212194a8aa64c9d4622f8b8c44e71.tar.gz Qt-4fe5f175f07212194a8aa64c9d4622f8b8c44e71.tar.bz2 | |
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
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qgraphicssystem_runtime.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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() |