summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-05 21:28:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-05 21:28:41 (GMT)
commit941b13d52d975069d10093a873cd3a55bb2fd7dd (patch)
treebb66b6379a551808e76de8c936e03bc9432613f5 /dist
parent777bf47da36292ffd37ae48a19796aafeb4d922e (diff)
parent2bc5d161e6820d459f00ac687ed99830a731cb74 (diff)
downloadQt-941b13d52d975069d10093a873cd3a55bb2fd7dd.zip
Qt-941b13d52d975069d10093a873cd3a55bb2fd7dd.tar.gz
Qt-941b13d52d975069d10093a873cd3a55bb2fd7dd.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: (49 commits) Fixed qt_x11_wait_for_window_manager Revert change 34f1758 on non-Synbian platforms Fixed QGifHandler::loopCount(). Fix tst_QAccessiblity failure. fix compile error when linuxinput keyboard driver is compiled as plugin Fixed the context menu test case in the qgraphicsscene autotest. fix regression from Qt 4.5 wrt missing text pixels in QTabBar Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown" Cleanup after "QGraphicsWidget is painted twice on the first show" Changed qgraphicswidget autotest to use qWaitForWindowShown. Improved QTest::qWaitForWindowShown on X11. Stabilize tst_QGraphicsWidget::initialShow2 (new test) Make sure we define S_IFDIR on Windows Fix copy/pasto Crash when closing any top-level widget on Symbian. Cache the sizes of the images in an animated GIF. Fix the QAbstractSlider autotest. Use OpenVG scissor on 90/180/270 rotations and simple clips. Optimize single-rect IntersectClip in OpenVG using the scissor QGraphicsWidget is painted twice on the first show. ...
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.6.228
1 files changed, 26 insertions, 2 deletions
diff --git a/dist/changes-4.6.2 b/dist/changes-4.6.2
index aa8d40b..b1c0159 100644
--- a/dist/changes-4.6.2
+++ b/dist/changes-4.6.2
@@ -66,8 +66,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.
- QApplication
* [QTBUG-6098] Added a flag to avoid construction of application panes.
@@ -113,6 +126,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
--------
@@ -196,6 +218,7 @@ Qt for Mac OS X
- [QTBUG-7832]: Restored missing margins around non-unified toolbars.
- [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.
- [QTBUG-7086]: QFileDialog now correctly responds to fileMode & acceptMode changes.
@@ -203,6 +226,7 @@ Qt for Mac OS X
- [QTBUG-7305]: Fixed a crash when deleting QMainWindow with native toolbar on Cocoa.
- [QTBUG-6882]: Fixed a text layout issue with QHeaderView in right-to-left mode.
+
Qt for Embedded Linux
---------------------