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

Conflicts:
	src/gui/kernel/qcocoaview_mac_p.h
	src/gui/widgets/qmainwindow.cpp

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index ee61871ed1..efdaaecd9a 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -287,6 +287,7 @@ private slots:
     void render_systemClip2();
     void render_systemClip3_data();
     void render_systemClip3();
+    void render_task252837();
 
     void setContentsMargins();
 
@@ -7138,6 +7139,16 @@ void tst_QWidget::render_systemClip3()
     }
 }
 
+void tst_QWidget::render_task252837()
+{
+    QWidget widget;
+    widget.resize(200, 200);
+
+    QPixmap pixmap(widget.size());
+    QPainter painter(&pixmap);
+    // Please do not crash.
+    widget.render(&painter);
+}
 void tst_QWidget::setContentsMargins()
 {
     QLabel label("why does it always rain on me?");