Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

1 files changed, 62 insertions, 5 deletions

diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index f249719ad0..887e93e455 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -66,6 +66,63 @@ information about a particular change.
    be consistent with win32-msvc200x.
 
 ****************************************************************************
+*                               DirectFB                                   *
+****************************************************************************
+
+ - When running Qt/DirectFB the DirectFB window id of a top level QWidget can
+   be queried using property("_q_DirectFBWindowID")
+
+ - Allow setting the background color of the primary layer in DirectFB with
+   connect options. QWS_DISPLAY=directfb:bgcolor=red or
+   QWS_DISPLAY=directfb:bgcolor=\#aabbccdd
+
+ - Add support for rendering mouse cursor using a top level window when cursor
+   support is not working in IDirectFBDisplayLayer. Define
+   QT_DIRECTFB_WINDOW_AS_CURSOR to enable.
+
+ - Add experimental support for optimized locking/unlocking of surfaces. Enable
+   by defining QT_DIRECTFB_SUBSURFACE.
+
+ - Fix a bug to conceptually allow using QDirectFBScreen as a subscreen of a
+   proxy screen. Don't make QDirectFBScreen::instance() assume that
+   QScreen::instance() is a QDirectFBScreen.
+
+ - Optimize move/resize operations with DirectFB. With a properly configured
+   DirectFB these operations are handled for us and we don't need to force a
+   repaint of the window.
+
+ - Support top level window opacity in DirectFB
+
+ - Fix a bug when loading RGB32 images that would lead to rendering issues.
+
+ - Fix a bug when painting with invalid pens/brushes.
+
+ - Fix a bug that would show up when QWidget::scroll is called.
+
+ - Implement support for loading pixmaps using IDirectFBImageProvider.
+
+ - Disable color table support by default. This seems to work incorrectly on
+   most boards and loading these images will generally require an image
+   conversion anyway.
+
+ - Fix a bug regarding QGraphicsProxyWidgets
+
+ - Fix a crash when resizing windows
+
+ - Compile with versions < 1.0. We still recommend using newer versions.
+
+ - Considerable code cleanup
+
+ - Various optimizations regarding painting, loading of images and creation of
+   surfaces.
+
+ - Allow forcibly falling back to raster engine for painting operations by
+   exporting QT_DIRECTFB_FORCE_RASTER=1
+
+ - Reenable support for RGB32 primary surface.
+
+
+****************************************************************************
 * Important Behavior Changes *
 ****************************************************************************
 
@@ -145,11 +202,11 @@ information about a particular change.
    means that code that assigned a float to a variant would create a
    variant with userType QMetaType::Float, instead of QVariant::Double.
 
- - QDataStream will now read and write all floating point numbers with the 
-   same precision, regardless of whether it's streamed into or out from a 
+ - QDataStream will now read and write all floating point numbers with the
+   same precision, regardless of whether it's streamed into or out from a
    float or double. This is to maintain compatibility across platforms with
    a different default precision for qreal. The default is 64-bit precision
-   for all floating point numbers, and this can be changed using the new 
-   function setFloatingPointPrecision(). Set Qt_4_5 as the version of the 
+   for all floating point numbers, and this can be changed using the new
+   function setFloatingPointPrecision(). Set Qt_4_5 as the version of the
    QDataStream to get the behavior of previous versions.
-   
+