Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev

5 files changed, 227 insertions, 0 deletions

diff --git a/tests/auto/gui/image/qimagereader/images/corrupt_clut.bmp b/tests/auto/gui/image/qimagereader/images/corrupt_clut.bmp
new file mode 100644
index 0000000000..aeb063fce5
--- /dev/null
+++ b/tests/auto/gui/image/qimagereader/images/corrupt_clut.bmp
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 7d353dfb91..bd02dc6255 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -1477,6 +1477,7 @@ void tst_QImageReader::readCorruptImage_data()
     QTest::newRow("corrupt gif") << QString("corrupt.gif") << true << QString("") << QByteArray("gif");
     QTest::newRow("corrupt png") << QString("corrupt.png") << true << QString("") << QByteArray("png");
     QTest::newRow("corrupt bmp") << QString("corrupt.bmp") << true << QString("") << QByteArray("bmp");
+    QTest::newRow("corrupt bmp (clut)") << QString("corrupt_clut.bmp") << true << QString("") << QByteArray("bmp");
     QTest::newRow("corrupt xpm (colors)") << QString("corrupt-colors.xpm") << true
                                           << QString("QImage: XPM color specification is missing: bla9an.n#x")
                                           << QByteArray("xpm");
diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST
index 774c22a8e9..0622ba30b7 100644
--- a/tests/auto/gui/kernel/qwindow/BLACKLIST
+++ b/tests/auto/gui/kernel/qwindow/BLACKLIST
@@ -1,3 +1,5 @@
+[testInputEvents]
+rhel-7.1
 [positioning:default]
 ubuntu-14.04
 [modalWindowPosition]
@@ -6,3 +8,5 @@ ubuntu-14.04
 ubuntu-14.04
 [setVisible]
 ubuntu-14.04
+[modalWindowEnterEventOnHide_QTBUG35109]
+ubuntu-14.04
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 232571bc1c..892dc0899f 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -92,6 +92,9 @@ private slots:
     void modalWithChildWindow();
     void modalWindowModallity();
     void modalWindowPosition();
+#ifndef QT_NO_CURSOR
+    void modalWindowEnterEventOnHide_QTBUG35109();
+#endif
     void windowsTransientChildren();
     void requestUpdate();
     void initTestCase();
@@ -868,10 +871,24 @@ public:
             }
         }
     }
+    bool event(QEvent *e) {
+        switch (e->type()) {
+        case QEvent::Enter:
+            ++enterEventCount;
+            break;
+        case QEvent::Leave:
+            ++leaveEventCount;
+            break;
+        default:
+            break;
+        }
+        return QWindow::event(e);
+    }
     void resetCounters() {
         mousePressedCount = mouseReleasedCount = mouseMovedCount = mouseDoubleClickedCount = 0;
         mouseSequenceSignature = QString();
         touchPressedCount = touchReleasedCount = touchMovedCount = 0;
+        enterEventCount = leaveEventCount = 0;
     }
 
     InputTestWindow() {
@@ -889,6 +906,7 @@ public:
     QPointF mousePressScreenPos, mouseMoveScreenPos, mousePressLocalPos;
     int touchPressedCount, touchReleasedCount, touchMovedCount;
     QEvent::Type touchEventType;
+    int enterEventCount, leaveEventCount;
 
     bool ignoreMouse, ignoreTouch;
 
@@ -1884,6 +1902,181 @@ void tst_QWindow::modalWindowPosition()
     QCOMPARE(window.geometry(), origGeo);
 }
 
+#ifndef QT_NO_CURSOR
+void tst_QWindow::modalWindowEnterEventOnHide_QTBUG35109()
+{
+    if (QGuiApplication::platformName() == QLatin1String("cocoa"))
+        QSKIP("This test fails on OS X on CI");
+
+    const QPoint center = QGuiApplication::primaryScreen()->availableGeometry().center();
+
+    const int childOffset = 16;
+    const QPoint rootPos = center - QPoint(m_testWindowSize.width(),
+                                           m_testWindowSize.height())/2;
+    const QPoint modalPos = rootPos + QPoint(childOffset * 5,
+                                             childOffset * 5);
+    const QPoint cursorPos = rootPos - QPoint(80, 80);
+
+    // Test whether tlw can receive the enter event
+    {
+        QCursor::setPos(cursorPos);
+        QCoreApplication::processEvents();
+
+        InputTestWindow root;
+        root.setTitle(__FUNCTION__);
+        root.setGeometry(QRect(rootPos, m_testWindowSize));
+        root.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&root));
+        root.requestActivate();
+        QVERIFY(QTest::qWaitForWindowActive(&root));
+
+        // Move the mouse over the root window, but not over the modal window.
+        QCursor::setPos(rootPos + QPoint(childOffset * 5 / 2,
+                                         childOffset * 5 / 2));
+
+        // Wait for the enter event. It must be delivered here, otherwise second
+        // compare can PASS because of this event even after "resetCounters()".
+        QTRY_COMPARE(root.enterEventCount, 1);
+        QTRY_COMPARE(root.leaveEventCount, 0);
+
+        QWindow modal;
+        modal.setTitle(QLatin1String("Modal - ") + __FUNCTION__);
+        modal.setTransientParent(&root);
+        modal.resize(m_testWindowSize/2);
+        modal.setFramePosition(modalPos);
+        modal.setModality(Qt::ApplicationModal);
+        modal.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&modal));
+        modal.requestActivate();
+        QVERIFY(QTest::qWaitForWindowActive(&modal));
+
+        QCoreApplication::processEvents();
+        QTRY_COMPARE(root.leaveEventCount, 1);
+
+        root.resetCounters();
+        modal.close();
+
+        // Check for the enter event
+        QTRY_COMPARE(root.enterEventCount, 1);
+    }
+
+    // Test whether child window can receive the enter event
+    {
+        QCursor::setPos(cursorPos);
+        QCoreApplication::processEvents();
+
+        QWindow root;
+        root.setTitle(__FUNCTION__);
+        root.setGeometry(QRect(rootPos, m_testWindowSize));
+
+        QWindow childLvl1;
+        childLvl1.setParent(&root);
+        childLvl1.setGeometry(childOffset,
+                              childOffset,
+                              m_testWindowSize.width() - childOffset,
+                              m_testWindowSize.height() - childOffset);
+
+        InputTestWindow childLvl2;
+        childLvl2.setParent(&childLvl1);
+        childLvl2.setGeometry(childOffset,
+                              childOffset,
+                              childLvl1.width() - childOffset,
+                              childLvl1.height() - childOffset);
+
+        root.show();
+        childLvl1.show();
+        childLvl2.show();
+
+        QVERIFY(QTest::qWaitForWindowExposed(&root));
+        root.requestActivate();
+        QVERIFY(QTest::qWaitForWindowActive(&root));
+        QVERIFY(childLvl1.isVisible());
+        QVERIFY(childLvl2.isVisible());
+
+        // Move the mouse over the child window, but not over the modal window.
+        // Be sure that the value is almost left-top of second child window for
+        // checking proper position mapping.
+        QCursor::setPos(rootPos + QPoint(childOffset * 5 / 2,
+                                         childOffset * 5 / 2));
+
+        // Wait for the enter event. It must be delivered here, otherwise second
+        // compare can PASS because of this event even after "resetCounters()".
+        QTRY_COMPARE(childLvl2.enterEventCount, 1);
+        QTRY_COMPARE(childLvl2.leaveEventCount, 0);
+
+        QWindow modal;
+        modal.setTitle(QLatin1String("Modal - ") + __FUNCTION__);
+        modal.setTransientParent(&root);
+        modal.resize(m_testWindowSize/2);
+        modal.setFramePosition(modalPos);
+        modal.setModality(Qt::ApplicationModal);
+        modal.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&modal));
+        modal.requestActivate();
+        QVERIFY(QTest::qWaitForWindowActive(&modal));
+
+        QCoreApplication::processEvents();
+        QTRY_COMPARE(childLvl2.leaveEventCount, 1);
+
+        childLvl2.resetCounters();
+        modal.close();
+
+        // Check for the enter event
+        QTRY_COMPARE(childLvl2.enterEventCount, 1);
+    }
+
+    // Test whether tlw can receive the enter event if mouse is over the invisible child windnow
+    {
+        QCursor::setPos(cursorPos);
+        QCoreApplication::processEvents();
+
+        InputTestWindow root;
+        root.setTitle(__FUNCTION__);
+        root.setGeometry(QRect(rootPos, m_testWindowSize));
+
+        QWindow child;
+        child.setParent(&root);
+        child.setGeometry(QRect(QPoint(), m_testWindowSize));
+
+        root.show();
+
+        QVERIFY(QTest::qWaitForWindowExposed(&root));
+        root.requestActivate();
+        QVERIFY(QTest::qWaitForWindowActive(&root));
+        QVERIFY(!child.isVisible());
+
+        // Move the mouse over the child window, but not over the modal window.
+        QCursor::setPos(rootPos + QPoint(childOffset * 5 / 2,
+                                         childOffset * 5 / 2));
+
+        // Wait for the enter event. It must be delivered here, otherwise second
+        // compare can PASS because of this event even after "resetCounters()".
+        QTRY_COMPARE(root.enterEventCount, 1);
+        QTRY_COMPARE(root.leaveEventCount, 0);
+
+        QWindow modal;
+        modal.setTitle(QLatin1String("Modal - ") + __FUNCTION__);
+        modal.setTransientParent(&root);
+        modal.resize(m_testWindowSize/2);
+        modal.setFramePosition(modalPos);
+        modal.setModality(Qt::ApplicationModal);
+        modal.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&modal));
+        modal.requestActivate();
+        QVERIFY(QTest::qWaitForWindowActive(&modal));
+
+        QCoreApplication::processEvents();
+        QTRY_COMPARE(root.leaveEventCount, 1);
+
+        root.resetCounters();
+        modal.close();
+
+        // Check for the enter event
+        QTRY_COMPARE(root.enterEventCount, 1);
+    }
+}
+#endif
+
 static bool isNativeWindowVisible(const QWindow *window)
 {
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
index 4b3d709812..7c60c8c9f8 100644
--- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
+++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
@@ -65,6 +65,7 @@ private slots:
     void setRawDataAndGetAsVector();
     void boundingRect();
     void mixedScripts();
+    void multiLineBoundingRect();
 
 private:
     int m_testFontId;
@@ -730,6 +731,34 @@ void tst_QGlyphRun::mixedScripts()
     QCOMPARE(glyphRuns.size(), 2);
 }
 
+void tst_QGlyphRun::multiLineBoundingRect()
+{
+    QTextLayout layout;
+    layout.setText("Foo Bar");
+    layout.beginLayout();
+
+    QTextLine line = layout.createLine();
+    line.setNumColumns(4);
+    line.setPosition(QPointF(0, 0));
+
+    line = layout.createLine();
+    line.setPosition(QPointF(0, 10));
+
+    layout.endLayout();
+
+    QCOMPARE(layout.lineCount(), 2);
+
+    QList<QGlyphRun> firstLineGlyphRuns = layout.lineAt(0).glyphRuns();
+    QList<QGlyphRun> allGlyphRuns = layout.glyphRuns();
+    QCOMPARE(firstLineGlyphRuns.size(), 1);
+    QCOMPARE(allGlyphRuns.size(), 1);
+
+    QGlyphRun firstLineGlyphRun = firstLineGlyphRuns.first();
+    QGlyphRun allGlyphRun = allGlyphRuns.first();
+
+    QVERIFY(firstLineGlyphRun.boundingRect().height() < allGlyphRun.boundingRect().height());
+}
+
 #endif // QT_NO_RAWFONT
 
 QTEST_MAIN(tst_QGlyphRun)