diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-11-10 10:35:10 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-11-10 10:35:10 (GMT) |
| commit | 294ca3b59dc02e1c89e2cac8007a74c61a2828fe (patch) | |
| tree | 77aaa7a83107953f9e5591d09917ecb0b5400268 /src/gui/styles | |
| parent | f42dd78db71c29d288b4a76a2fcfe720335afe1a (diff) | |
| parent | 451e7fcad72366cf40bcb00931b86aafba1b983f (diff) | |
| download | Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.zip Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.tar.gz Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 5204743..eeaf7e8 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -433,7 +433,7 @@ QColor QS60StylePrivate::colorFromFrameGraphics(SkinFrameElements frame) const return Qt::black; const QRgb *pixelRgb = (const QRgb*)frameImage.bits(); - const int pixels = frameImage.numBytes()/sizeof(QRgb); + const int pixels = frameImage.byteCount()/sizeof(QRgb); int estimatedRed = 0; int estimatedGreen = 0; |