diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 12:14:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 12:14:04 (GMT) |
| commit | fbbcb2ac1705f6a58c3e5ae61ba038a37acd984c (patch) | |
| tree | ffff0c328cbf3fd3f6281de7830146a2e8bf2b51 | |
| parent | 8c4991d5b034d518dd06dc42c3cc9a7fa9b9e3a1 (diff) | |
| parent | ea0f3f7db1d62b2ee94addbeb991061bc2811745 (diff) | |
| download | Qt-fbbcb2ac1705f6a58c3e5ae61ba038a37acd984c.zip Qt-fbbcb2ac1705f6a58c3e5ae61ba038a37acd984c.tar.gz Qt-fbbcb2ac1705f6a58c3e5ae61ba038a37acd984c.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style cannot draw transparency to UI element border areas
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 1138d20..97cf919 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -859,11 +859,9 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(QS60StylePrivate::SkinFr User::LeaveIfError(bitmapDev->CreateContext(bitmapGc)); CleanupStack::PushL(bitmapGc); -#ifndef Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE frame->LockHeap(); memset(frame->DataAddress(), 0, frame->SizeInPixels().iWidth * frame->SizeInPixels().iHeight * 4); // 4: argb bytes frame->UnlockHeap(); -#endif const TRect outerRect(TPoint(0, 0), targetSize); const TRect innerRect = innerRectFromElement(frameElement, outerRect); |