diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-09 10:54:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-09 10:54:02 (GMT) |
| commit | 24cd118737732a51c6c2db92937903c8ab37e892 (patch) | |
| tree | 2076defbb713e4dfea8fb59fa3256f6d372c882f /src/gui | |
| parent | 0c62d147c21da6f0b812820944fbb2a63cea1e4a (diff) | |
| parent | 57092a111a314a3cafdbc5d8302cf716b6bbda36 (diff) | |
| download | Qt-24cd118737732a51c6c2db92937903c8ab37e892.zip Qt-24cd118737732a51c6c2db92937903c8ab37e892.tar.gz Qt-24cd118737732a51c6c2db92937903c8ab37e892.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Last word inputted was duplicated after input method hints changed
Simplify texture pooling logic in GL graphics system.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpixmapdata_p.h | 5 | ||||
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 3e5699d..099c61c 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -56,6 +56,10 @@ #include <QtGui/qpixmap.h> #include <QtCore/qatomic.h> +#ifdef Q_OS_SYMBIAN +#include <QtGui/private/qvolatileimage_p.h> +#endif + QT_BEGIN_NAMESPACE class QImageReader; @@ -134,6 +138,7 @@ public: } #if defined(Q_OS_SYMBIAN) + virtual QVolatileImage toVolatileImage() const { return QVolatileImage(); } virtual void* toNativeType(NativeType type); virtual void fromNativeType(void* pixmap, NativeType type); #endif diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index b513365..b15dcac 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -640,6 +640,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) { using namespace Qt; + reset(); commitTemporaryPreeditString(); const bool anynumbermodes = hints & (ImhDigitsOnly | ImhFormattedNumbersOnly | ImhDialableCharactersOnly); |