Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	mkspecs/features/qt.prf
	src/plugins/platforms/xcb/qxcbwindow.h
	src/tools/qdoc/qdocindexfiles.cpp
	src/widgets/kernel/qwidget_qpa.cpp

Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67

2 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 589f3e66e1..868288e36e 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -92,6 +92,7 @@ private slots:
     void modalDialogClosingOneOfTwoModal();
     void modalWithChildWindow();
     void modalWindowModallity();
+    void modalWindowPosition();
 
     void initTestCase()
     {
@@ -1429,6 +1430,18 @@ void tst_QWindow::modalWindowModallity()
 
 }
 
+void tst_QWindow::modalWindowPosition()
+{
+    QWindow window;
+    window.setGeometry(QRect(100, 100, 400, 400));
+    // Allow for any potential resizing due to constraints
+    QRect origGeo = window.geometry();
+    window.setModality(Qt::WindowModal);
+    window.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&window));
+    QCOMPARE(window.geometry(), origGeo);
+}
+
 #include <tst_qwindow.moc>
 QTEST_MAIN(tst_QWindow)
 
diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
index 2c45b7d2ec..a4e1490b01 100644
--- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
+++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
@@ -951,6 +951,11 @@ void tst_QRawFont::rawFontFromInvalidData()
     font.loadFromData(invalidData, 10, QFont::PreferDefaultHinting);
 
     QVERIFY(!font.isValid());
+
+    invalidData.fill(255, 1024);
+    font.loadFromData(invalidData, 10, QFont::PreferDefaultHinting);
+
+    QVERIFY(!font.isValid());
 }
 
 #endif // QT_NO_RAWFONT