1 files changed, 42 insertions, 3 deletions
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index b1ddc6e7a2..6bbb30a6db 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -32,6 +32,9 @@
 #include <private/qtablewidget_p.h>
 #include <QtTest/QtTest>
 #include "private/qapplication_p.h"
+#if QT_CONFIG(textmarkdownwriter)
+#include "private/qtextmarkdownwriter_p.h"
+#endif
 
 #include <algorithm>
 
@@ -196,6 +199,10 @@ private slots:
     void viewOptions();
 
     void taskQTBUG_7232_AllowUserToControlSingleStep();
+
+#if QT_CONFIG(textmarkdownwriter)
+    void markdownWriter();
+#endif
 };
 
 // Testing get/set functions
@@ -4067,8 +4074,10 @@ void tst_QTableView::mouseWheel()
     view.verticalScrollBar()->setValue(10);
 
     QPoint pos = view.viewport()->geometry().center();
-    QWheelEvent verticalEvent(pos, delta, 0, 0, Qt::Vertical);
-    QWheelEvent horizontalEvent(pos, delta, 0, 0, Qt::Horizontal);
+    QWheelEvent verticalEvent(pos, view.mapToGlobal(pos), QPoint(), QPoint(0, delta),
+                              Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
+    QWheelEvent horizontalEvent(pos, view.mapToGlobal(pos), QPoint(), QPoint(delta, 0),
+                                Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
     QApplication::sendEvent(view.viewport(), &horizontalEvent);
     QVERIFY(qAbs(view.horizontalScrollBar()->value() - horizontalPositon) < 15);
     QApplication::sendEvent(view.viewport(), &verticalEvent);
@@ -4343,7 +4352,9 @@ void tst_QTableView::taskQTBUG_5237_wheelEventOnHeader()
     int sbValueBefore = view.verticalScrollBar()->value();
     QHeaderView *header = view.verticalHeader();
     QTest::mouseMove(header);
-    QWheelEvent wheelEvent(header->geometry().center(), -720, 0, 0);
+    QPoint pos = header->geometry().center();
+    QWheelEvent wheelEvent(pos, header->viewport()->mapToGlobal(pos), QPoint(), QPoint(0, -720),
+                           Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false);
     QApplication::sendEvent(header->viewport(), &wheelEvent);
     int sbValueAfter = view.verticalScrollBar()->value();
     QVERIFY(sbValueBefore != sbValueAfter);
@@ -4560,5 +4571,33 @@ void tst_QTableView::taskQTBUG_50171_selectRowAfterSwapColumns()
     }
 }
 
+// This has nothing to do with QTableView, but it's convenient to reuse the QtTestTableModel
+#if QT_CONFIG(textmarkdownwriter)
+
+// #define DEBUG_WRITE_OUTPUT
+
+void tst_QTableView::markdownWriter()
+{
+    QtTestTableModel model(2, 3);
+    QString md;
+    {
+        QTextStream stream(&md);
+        QTextMarkdownWriter writer(stream, QTextDocument::MarkdownDialectGitHub);
+        writer.writeTable(&model);
+    }
+
+#ifdef DEBUG_WRITE_OUTPUT
+    {
+        QFile out("/tmp/table.md");
+        out.open(QFile::WriteOnly);
+        out.write(md.toUtf8());
+        out.close();
+    }
+#endif
+
+    QCOMPARE(md, QString::fromLatin1("|1      |2      |3      |\n|-------|-------|-------|\n|[0,0,0]|[0,1,0]|[0,2,0]|\n|[1,0,0]|[1,1,0]|[1,2,0]|\n"));
+}
+#endif
+
 QTEST_MAIN(tst_QTableView)
 #include "tst_qtableview.moc"