diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-17 08:22:29 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-17 08:22:29 (GMT) |
| commit | ae0d4fcee9087521afe03732001a0267b06e0317 (patch) | |
| tree | 60a368a1658327af8ba9955bfd08574146cd754e /src | |
| parent | 8f9d5e666401d2ecf9a5623504df674a2bcbe035 (diff) | |
| parent | 80eb06b6e95ecf0b88534f15ddd9c6c892c08980 (diff) | |
| download | Qt-ae0d4fcee9087521afe03732001a0267b06e0317.zip Qt-ae0d4fcee9087521afe03732001a0267b06e0317.tar.gz Qt-ae0d4fcee9087521afe03732001a0267b06e0317.tar.bz2 | |
Merge commit 'staging-1/4.7' into friday
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/codecs/qtextcodec_symbian.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/codecs/qtextcodec_symbian.cpp b/src/corelib/codecs/qtextcodec_symbian.cpp index 322c146..18c5fd0 100644 --- a/src/corelib/codecs/qtextcodec_symbian.cpp +++ b/src/corelib/codecs/qtextcodec_symbian.cpp @@ -115,11 +115,11 @@ static const QSymbianCodecInitData codecsData[] = { { /*271082494*/ 271082494, 0, "gsm7_turkish_single\0" }, { /*271082495*/ 271082495, 0, "turkish_locking_gsm7ext\0" }, { /*271082496*/ 271082496, 0, "turkish_locking_single\0" }, - { /*271082503*/ 271082503, 0, "portuguese_gsm7_single\0" }, - { /*271082504*/ 271082504, 0, "portuguese_locking_gsm7ext\0" }, - { /*271082505*/ 271082505, 0, "portuguese_locking_single\0" }, - { /*271082506*/ 271082506, 0, "spanish_gsm7_single\0" }, - { /*271085624*/ 271085624, 114, "GB18030\0" }, + { /*271082503*/ 271082503, 0, "portuguese_gsm7_single\0" }, + { /*271082504*/ 271082504, 0, "portuguese_locking_gsm7ext\0" }, + { /*271082505*/ 271082505, 0, "portuguese_locking_single\0" }, + { /*271082506*/ 271082506, 0, "spanish_gsm7_single\0" }, + { /*271085624*/ 271085624, 114, "GB18030\0" }, { /*536929574*/ 536929574, 38, "EUC-KR\0" }, { /*536936703*/ 536936703, 0, "CP949\0" }, { /*536936705*/ 536936705, 37, "ISO-2022-KR\0" }, @@ -667,7 +667,7 @@ QSymbianTextCodec *QSymbianTextCodec::init() // We did not find the charsetId in our codecsData[], therefore we ask // the OS for the codec name. We first try to get a "standard name" and fall // back to array->At(i).Name(), if really needed. array->At(i).Name() is not - // guaranteed to be a correct name for QTextCodec::codecFromName(). + // guaranteed to be a correct name for QTextCodec::codecFromName(). QScopedPointer<HBufC8> buf; QT_TRAP_THROWING(buf.reset(converter->ConvertCharacterSetIdentifierToStandardNameL(charsetId, qt_s60GetRFs()))) QByteArray name; diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index d5f0d42..4869eba 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -978,7 +978,7 @@ void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode m break; case QPainter::CompositionMode_SourceOver: compositionModeStatus &= ~PorterDuff_AlwaysBlend; - surface->SetPorterDuff(surface, DSPD_SRC_OVER); + surface->SetPorterDuff(surface, DSPD_NONE); break; case QPainter::CompositionMode_DestinationOver: surface->SetPorterDuff(surface, DSPD_DST_OVER); |