From a393ea072982fa706bb6585295ed6c22e7cbca06 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@qbc.io>
Date: Fri, 5 Jul 2019 06:13:07 +0900
Subject: [PATCH] Fix build without features.itemmodel

Change-Id: I1235bed395a47438bc18571e2331a3432e274dec
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/gui/text/qtextmarkdownwriter.cpp | 5 +++++
 src/gui/text/qtextmarkdownwriter_p.h | 5 ++++-
 src/testlib/qtest.h                  | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/gui/text/qtextmarkdownwriter.cpp b/src/gui/text/qtextmarkdownwriter.cpp
index f351c8d20b8..cbfb092485f 100644
--- a/src/gui/text/qtextmarkdownwriter.cpp
+++ b/src/gui/text/qtextmarkdownwriter.cpp
@@ -47,6 +47,9 @@
 #include "qtextcursor.h"
 #include "qtextimagehandler_p.h"
 #include "qloggingcategory.h"
+#if QT_CONFIG(itemmodel)
+#include "qabstractitemmodel.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -70,6 +73,7 @@ bool QTextMarkdownWriter::writeAll(const QTextDocument *document)
     return true;
 }
 
+#if QT_CONFIG(itemmodel)
 void QTextMarkdownWriter::writeTable(const QAbstractItemModel *table)
 {
     QVector<int> tableColumnWidths(table->columnCount());
@@ -101,6 +105,7 @@ void QTextMarkdownWriter::writeTable(const QAbstractItemModel *table)
     }
     m_listInfo.clear();
 }
+#endif
 
 void QTextMarkdownWriter::writeFrame(const QTextFrame *frame)
 {
diff --git a/src/gui/text/qtextmarkdownwriter_p.h b/src/gui/text/qtextmarkdownwriter_p.h
index 90310250ac7..c3076155d06 100644
--- a/src/gui/text/qtextmarkdownwriter_p.h
+++ b/src/gui/text/qtextmarkdownwriter_p.h
@@ -56,16 +56,19 @@
 
 #include "qtextdocument_p.h"
 #include "qtextdocumentwriter.h"
-#include "QAbstractTableModel"
 
 QT_BEGIN_NAMESPACE
 
+class QAbstractItemModel;
+
 class Q_GUI_EXPORT QTextMarkdownWriter
 {
 public:
     QTextMarkdownWriter(QTextStream &stream, QTextDocument::MarkdownFeatures features);
     bool writeAll(const QTextDocument *document);
+#if QT_CONFIG(itemmodel)
     void writeTable(const QAbstractItemModel *table);
+#endif
 
     int writeBlock(const QTextBlock &block, bool table, bool ignoreFormat, bool ignoreEmpty);
     void writeFrame(const QTextFrame *frame);
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 89abc616d9d..7affdcb8b49 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -51,7 +51,9 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qcborcommon.h>
 #include <QtCore/qdatetime.h>
+#if QT_CONFIG(itemmodel)
 #include <QtCore/qabstractitemmodel.h>
+#endif
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qurl.h>
@@ -129,12 +131,14 @@ template<> inline char *toString(const QChar &c)
     return qstrdup(qPrintable(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast<int>(c.unicode()), 16))));
 }
 
+#if QT_CONFIG(itemmodel)
 template<> inline char *toString(const QModelIndex &idx)
 {
     char msg[128];
     qsnprintf(msg, sizeof(msg), "QModelIndex(%d,%d,%p,%p)", idx.row(), idx.column(), idx.internalPointer(), idx.model());
     return qstrdup(msg);
 }
+#endif
 
 template<> inline char *toString(const QPoint &p)
 {