diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2010-02-04 09:08:43 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2010-02-04 09:08:43 (GMT) |
| commit | 47b7af3bfd78c6d4efd3ce93be275a60430679d2 (patch) | |
| tree | e7d7ff32ae72008b74df37e13caf568b33ac19b5 /dist | |
| parent | 8e98033a67263f6a2d9155f228dc28e2faee4f5e (diff) | |
| parent | 39523f9f78a7c93643924711b1ed8006ebfcf5ce (diff) | |
| download | Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.zip Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.tar.gz Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Manual resolve of conflict in changes-4.6.2 in staging-2.
Conflicts:
dist/changes-4.6.2
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.6.2 | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/dist/changes-4.6.2 b/dist/changes-4.6.2 index 00509ed..c679ce6 100644 --- a/dist/changes-4.6.2 +++ b/dist/changes-4.6.2 @@ -46,8 +46,21 @@ QtCore QtGui ----- - - foo - * bar + - QAbstractScrollArea + * [QTBUG-1760] Reverted horizontal scrolling with mouse wheel when vertical scrollbar is hidden + + - QBmpHandler + * [QTBUG-7530] Fixed an infinite loop that could occur when reading invalid BMP images. + + - QGraphicsEffect + * [QTBUG-6901] Fixed performance problem when translating items with + graphics effects. + + - QImage + * [QTBUG-7231] Avoid an unnecessary copy in QImage::scaled(). + + - QPDFEngine + * [QTBUG-7249] Fixed the encoding of the Tile and Creator tags in the PDF engine. * [QTBUG-7029] Fixed a crash when re-creating QApplication object due to a dangling gesture manager pointer. @@ -69,6 +82,15 @@ QtOpenGL - [QTBUG-7490] Better support for user-generated binary shaders. + - QGLWidget + * [QTBUG-7213] Fixed QGLWidget::renderPixmap() on Windows. + + - QGLPixelBuffer + * [QTBUG-7476] Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers. + + - QGL2PaintEngineEx + * [QTBUG-7203] Reset the GL stencil mask, op and function in resetGLState(). + QtOpenVG -------- @@ -138,9 +160,11 @@ Qt for Windows Qt for Mac OS X --------------- - - [QTBUG-7312]: Menubar and dock disappear after hiding a fullscreen widget on Cocoa. - - [QTBUG-7522]: Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash. - - [QTBUG-7625]: Calling showFullScreen() then showNormal() on a widget results in top menu hiding. + - QPrintPreviewDialog + * [QTBUG-7312]: Menubar and dock disappear after hiding a fullscreen widget on Cocoa. + * [QTBUG-7481]: Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. + * [QTBUG-7522]: Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash. + * [QTBUG-7625]: Calling showFullScreen() then showNormal() on a widget results in top menu hiding. Qt for Embedded Linux |