summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-03 06:19:45 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-03 06:19:45 (GMT)
commit21a1613da90e7b3f0d2d2b03983e236a55db15b0 (patch)
tree1b38d9600995b9e33d10d17c03bc50dfbbeab45e /dist
parent0d9ff247db8ca64e0dcfd0ea05c3a615abab845b (diff)
parentc186c0402781ec6ef6ee97e2168d16f0b043044e (diff)
downloadQt-21a1613da90e7b3f0d2d2b03983e236a55db15b0.zip
Qt-21a1613da90e7b3f0d2d2b03983e236a55db15b0.tar.gz
Qt-21a1613da90e7b3f0d2d2b03983e236a55db15b0.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits) Make DSFLIP_ONSYNC part of the default flip flags. Fixed a failure in tst_qgl. 4.6.2 changes Avoids a possible crash when saving the state of a main window Implemented QGifHandler::imageCount(). Fixed compilation of the GL2 engine for OpenGL ES 2. fix whitespace Document that QModelIndex::child does not work for the root item Fixed missing textures in the boxes demo. Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux Assert failure when setting a widget focus proxy as its successor in tab order Fixed garbled 3D Qt logo in the overpainting example. fix crash in Phonon::DS9 backend Don't crash when running Qt on KDE with Oxygen style. Fixes missing update when setting opacity on an item that had opacity 0.0 Avoids missing opacity updates by not propagating the ignoreOpacity flag Cleanup in graphicsitem autotest Adds convenience functions QGraphicsItemPrivate::isOpacityNull Fixed a crash when QPixmaps are destroyed after the ~QApplication. Fix GL texture leaks when pixmaps are deleted ...
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.6.223
1 files changed, 18 insertions, 5 deletions
diff --git a/dist/changes-4.6.2 b/dist/changes-4.6.2
index 4f46a1f..58dcf0e 100644
--- a/dist/changes-4.6.2
+++ b/dist/changes-4.6.2
@@ -46,8 +46,14 @@ QtCore
QtGui
-----
- - foo
- * bar
+ - QBmpHandler
+ * [QTBUG-7530] Fixed an infinite loop that could occur when reading invalid BMP images.
+
+ - 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.
QtDBus
------
@@ -64,8 +70,14 @@ QtNetwork
QtOpenGL
--------
- - foo
- * bar
+ - 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().
QtScript
--------
@@ -128,7 +140,8 @@ Qt for Windows
Qt for Mac OS X
---------------
- -
+ - QPrintPreviewDialog
+ * [QTBUG-7481] Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.
Qt for Embedded Linux
---------------------