Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index d5fea19c41..7f3c289fb4 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -96,6 +96,7 @@ private slots:
     void taskQTBUG_40609_addingWidgetToItsOwnLayout();
     void taskQTBUG_40609_addingLayoutToItself();
     void replaceWidget();
+    void dontCrashWhenExtendsToEnd();
 
 private:
     QWidget *testWidget;
@@ -1728,5 +1729,22 @@ void tst_QGridLayout::replaceWidget()
     }
 }
 
+void tst_QGridLayout::dontCrashWhenExtendsToEnd()
+{
+    QWidget window;
+    window.resize(320,200);
+    QWidget parent(&window);
+    QLabel *lbl0 = new QLabel(QLatin1String("lbl0:"));
+    QLabel *lbl1 = new QLabel(QLatin1String("lbl1:"));
+    QPushButton *pb = new QPushButton(QLatin1String("pb1"));
+    QGridLayout *l = new QGridLayout(&parent);
+    l->addWidget(lbl0, 0, 0);
+    l->addWidget(lbl1, 1, 0);
+    // adding an item in the bottom right corner than spans to the end (!)...
+    l->addWidget(pb, 1, 1, -1, -1);
+    // ...should not cause a crash when the items are distributed....
+    l->setGeometry(QRect(0, 0, 200, 50));    // DONT CRASH HERE
+}
+
 QTEST_MAIN(tst_QGridLayout)
 #include "tst_qgridlayout.moc"