diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 16:05:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 16:05:56 (GMT) |
| commit | ca83e2df556e4e3db361ffd09696ef6c94d7324e (patch) | |
| tree | 237edade3dc9e5fcdf623f9e7882805f0ea86c14 /src/gui | |
| parent | 8ddf96a15f707001755d5b934f3f900b825b5887 (diff) | |
| parent | 57530dab8043c67b1356fb764fc83f6ef00dfdc1 (diff) | |
| download | Qt-ca83e2df556e4e3db361ffd09696ef6c94d7324e.zip Qt-ca83e2df556e4e3db361ffd09696ef6c94d7324e.tar.gz Qt-ca83e2df556e4e3db361ffd09696ef6c94d7324e.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpixmap_raster.cpp | 3 | ||||
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 1e7ff04..a5f42c1 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -386,6 +386,9 @@ int QRasterPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const void QRasterPixmapData::createPixmapForImage(QImage &sourceImage, Qt::ImageConversionFlags flags, bool inPlace) { QImage::Format format; + if (flags & Qt::NoFormatConversion) + format = sourceImage.format(); + else #ifdef Q_WS_QWS if (pixelType() == BitmapType) { format = QImage::Format_Mono; diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 46f1d62..d121e03 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1650,8 +1650,10 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons emit q->cursorPositionChanged(); _q_updateCurrentCharFormatAndSelection(); #ifndef QT_NO_IM - if (QInputContext *ic = inputContext()) { - ic->update(); + if (contextWidget) { + if (QInputContext *ic = inputContext()) { + ic->update(); + } } #endif //QT_NO_IM } else { |