diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-27 15:05:59 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-27 15:05:59 (GMT) |
| commit | 7ca94a08b9c232aaccb74fa85912515b8f9a6619 (patch) | |
| tree | e60229477bc8269cf14904620bf0fc5ad18ef6d0 /src/gui/kernel/qsoftkeymanager_s60.cpp | |
| parent | f8c9314d6224948c28487e291b4cdad0049682c7 (diff) | |
| parent | 7285c09ef777569514e73dffa22ecfdb7df6ba8f (diff) | |
| download | Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.zip Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.gz Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp index fee1580..c81d75f 100644 --- a/src/gui/kernel/qsoftkeymanager_s60.cpp +++ b/src/gui/kernel/qsoftkeymanager_s60.cpp @@ -265,7 +265,7 @@ bool QSoftKeyManagerPrivateS60::setSoftkeyImage(CEikButtonGroupContainer *cba, CFbsBitmap* nMask = softkeyAlpha.toSymbianCFbsBitmap(); CEikImage* myimage = new (ELeave) CEikImage; - myimage->SetPicture( nBitmap, nMask ); // nBitmap and nMask ownership transfered + myimage->SetPicture( nBitmap, nMask ); // nBitmap and nMask ownership transferred EikSoftkeyImage::SetImage(cba, *myimage, left); // Takes myimage ownership cbaHasImage[position] = true; |