diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 13:03:20 +0100 |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 13:03:20 +0100 |
| commit | cf417f787454f131f35248bb0c1294dadd777b45 (patch) | |
| tree | e5ad2f54887aa695c6f66ae2c305ab75ccabdac0 /src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp | |
| parent | a7577f8c3ae3a025384d8d19fdf3575ef141a70b (diff) | |
| parent | e07878a9bcccbf063650272329c0aca14290b8e3 (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp index cb4fb8895c..daefa21d97 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp @@ -176,7 +176,7 @@ int QDirectFBPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const return QDirectFBScreen::depth(imageFormat); case QPaintDevice::PdmNumColors: { if (!lockedImage.isNull()) - return lockedImage.numColors(); + return lockedImage.colorCount(); DFBResult result; IDirectFBPalette *palette = 0; |