From 7dce0e368cdeec00641d029101d34e9ce64395f6 Mon Sep 17 00:00:00 2001 From: mread Date: Mon, 3 Aug 2009 14:42:57 +0100 Subject: fixed qt_pixmapToNativeBitmap name merge problem --- src/gui/kernel/qwidget_s60.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index bf53f5d..b206517 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -706,8 +706,8 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset) // Convert to CFbsBitmp // TODO: When QPixmap is adapted to use native CFbsBitmap, // it could be set directly to context pane - CFbsBitmap* nBitmap = qt_pixmapToNativeBitmapL(pm, false); - CFbsBitmap* nMask = qt_pixmapToNativeBitmapL(mask, true); + CFbsBitmap* nBitmap = qt_pixmapToNativeBitmap(pm, false); + CFbsBitmap* nMask = qt_pixmapToNativeBitmap(mask, true); contextPane->SetPicture(nBitmap,nMask); } else { @@ -740,8 +740,8 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset) // Convert to CFbsBitmp // TODO: When QPixmap is adapted to use native CFbsBitmap, // it could be set directly to context pane - CFbsBitmap* nBitmap = qt_pixmapToNativeBitmapL(pm, false); - CFbsBitmap* nMask = qt_pixmapToNativeBitmapL(mask, true); + CFbsBitmap* nBitmap = qt_pixmapToNativeBitmap(pm, false); + CFbsBitmap* nMask = qt_pixmapToNativeBitmap(mask, true); titlePane->SetSmallPicture( nBitmap, nMask, ETrue ); } else { -- cgit v0.12