diff options
| author | mread <qt-info@nokia.com> | 2009-08-03 13:42:57 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-03 13:42:57 (GMT) |
| commit | 7dce0e368cdeec00641d029101d34e9ce64395f6 (patch) | |
| tree | 694aae5b00d2f3e630fa1c4560477951d36e9d0b /src/gui/kernel/qwidget_s60.cpp | |
| parent | 41a83e1ff19ad1396e6001e6b0ac003c701ba55a (diff) | |
| download | Qt-7dce0e368cdeec00641d029101d34e9ce64395f6.zip Qt-7dce0e368cdeec00641d029101d34e9ce64395f6.tar.gz Qt-7dce0e368cdeec00641d029101d34e9ce64395f6.tar.bz2 | |
fixed qt_pixmapToNativeBitmap name merge problem
Diffstat (limited to 'src/gui/kernel/qwidget_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 8 |
1 files 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 { |