Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
	tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
	tests/auto/selftests/expected_skip.txt
	tests/auto/selftests/tst_selftests.cpp

1 files changed, 38 insertions, 0 deletions

diff --git a/dist/changes-4.5.2 b/dist/changes-4.5.2
index 1e0020840f..98ea59ecd8 100644
--- a/dist/changes-4.5.2
+++ b/dist/changes-4.5.2
@@ -46,6 +46,18 @@ Third party components
        Plugins (r41346, r43550, r43915, r43917, r43923)
        Clipboard (r41360)
 
+- QMacStyle
+    * [253339] Don't draw arrows on toolbuttons that have a menu and text only.
+    * [252301] Ensure that small and mini spin boxes are drawn correctly.
+
+- QFontDialog
+    * [252000] Ensure that QFontDialog::getFont() works on Mac OS X.
+
+- QWidget
+    * [250668] Don't send extra wheel events when using the scroll wheel in Cocoa.
+    * [253448] Prevent a crash when using the Qt::WA_MacBrushedMetal attribute
+      in conjunction with style sheets.
+
 ****************************************************************************
 *                          Database Drivers                                *
 ****************************************************************************
@@ -65,6 +77,10 @@ Qt for Windows
 
 Qt for Mac OS X
 ---------------
+[252795] Ensure that we send Apple Events in the Cocoa port even when Cocoa isn't ready.
+[252176] Fix regression in drawing parts of pixmaps on Panther.
+[253402] Fix a crash when a Cocoa window that used to be a QWidget would get events
+         after the QWidget was destroyed.
 
 
 Qt for Embedded Linux
@@ -101,6 +117,8 @@ Qt for Windows CE
      of 'Fixed' on the main cointainer.
    * [253278] Made it possible to set QString-type properties using
      QDesignerFormWindowCursor::setProperty().
+   * [253539] Prevent crash in Designer with the Cocoa port when when using a scroll
+     wheel to change a property.
 
 - Linguist
   - Linguist GUI
@@ -139,6 +157,26 @@ Qt for Windows CE
 *                          Plugins                                         *
 ****************************************************************************
 
+- directfb
+  * Make sure we pick an approriate format for pixmaps. E.g. use the same as
+    the primary surface for opaque pixmaps and pick an appropriate one for
+    transparent pixmaps if the primary surface format is not transparent.
+  * Properly fall back to the raster engine for pens that aren't solidcolor
+  * Properly fall back to raster engine with "mirrored" scales
+  * Make sure window surfaces are the approriate pixel format and created in
+    video memory if supported
+  * Fix clipping bug that would cause painting errors
+  * Fix various crash bugs
+  * Fix bugs when transforming/copying pixmaps with alpha channel
+  * Fix various bugs with regards to painting with alpha channel/porter duff
+  * Optimize a coupld of internal functions to slightly speed up drawing
+  * Optimize raster fall backs
+  * Allow more customization for Flipping options
+  * Fix drawing with opacity != 1.0
+  * Support for better logging when trying to debug performance problems.
+  * Fix bug in keyboard handling that caused modifiers not to work
+  * Get rid of some compiler warnings
+
 
 ****************************************************************************
 *                   Important Behavior Changes                             *