1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build without features.itemmodel

Browse Source 
Change-Id: I1235bed395a47438bc18571e2331a3432e274dec
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Tasuku Suzuki 2019-07-05 06:13:07 +09:00
parent e36247754e
commit a393ea0729
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/text/qtextmarkdownwriter.cpp
View File

@ -47,6 +47,9 @@
#include "qtextcursor.h" #include "qtextcursor.h"
#include "qtextimagehandler_p.h" #include "qtextimagehandler_p.h"
#include "qloggingcategory.h" #include "qloggingcategory.h"
#if QT_CONFIG(itemmodel)
#include "qabstractitemmodel.h"
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -70,6 +73,7 @@ bool QTextMarkdownWriter::writeAll(const QTextDocument *document)
return true; return true;
} }
#if QT_CONFIG(itemmodel)
void QTextMarkdownWriter::writeTable(const QAbstractItemModel *table) void QTextMarkdownWriter::writeTable(const QAbstractItemModel *table)
{ {
QVector<int> tableColumnWidths(table->columnCount()); QVector<int> tableColumnWidths(table->columnCount());
@ -101,6 +105,7 @@ void QTextMarkdownWriter::writeTable(const QAbstractItemModel *table)
} }
m_listInfo.clear(); m_listInfo.clear();
} }
#endif
void QTextMarkdownWriter::writeFrame(const QTextFrame *frame) void QTextMarkdownWriter::writeFrame(const QTextFrame *frame)
{ {

5
src/gui/text/qtextmarkdownwriter_p.h
View File

@ -56,16 +56,19 @@
#include "qtextdocument_p.h" #include "qtextdocument_p.h"
#include "qtextdocumentwriter.h" #include "qtextdocumentwriter.h"
#include "QAbstractTableModel"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QAbstractItemModel;
class Q_GUI_EXPORT QTextMarkdownWriter class Q_GUI_EXPORT QTextMarkdownWriter
{ {
public: public:
QTextMarkdownWriter(QTextStream &stream, QTextDocument::MarkdownFeatures features); QTextMarkdownWriter(QTextStream &stream, QTextDocument::MarkdownFeatures features);
bool writeAll(const QTextDocument *document); bool writeAll(const QTextDocument *document);
#if QT_CONFIG(itemmodel)
void writeTable(const QAbstractItemModel *table); void writeTable(const QAbstractItemModel *table);
#endif
int writeBlock(const QTextBlock &block, bool table, bool ignoreFormat, bool ignoreEmpty); int writeBlock(const QTextBlock &block, bool table, bool ignoreFormat, bool ignoreEmpty);
void writeFrame(const QTextFrame *frame); void writeFrame(const QTextFrame *frame);

4
src/testlib/qtest.h
View File

@ -51,7 +51,9 @@
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>
#include <QtCore/qcborcommon.h> #include <QtCore/qcborcommon.h>
#include <QtCore/qdatetime.h> #include <QtCore/qdatetime.h>
#if QT_CONFIG(itemmodel)
#include <QtCore/qabstractitemmodel.h> #include <QtCore/qabstractitemmodel.h>
#endif
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qurl.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)))); 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) template<> inline char *toString(const QModelIndex &idx)
{ {
char msg[128]; char msg[128];
qsnprintf(msg, sizeof(msg), "QModelIndex(%d,%d,%p,%p)", idx.row(), idx.column(), idx.internalPointer(), idx.model()); qsnprintf(msg, sizeof(msg), "QModelIndex(%d,%d,%p,%p)", idx.row(), idx.column(), idx.internalPointer(), idx.model());
return qstrdup(msg); return qstrdup(msg);
} }
#endif
template<> inline char *toString(const QPoint &p) template<> inline char *toString(const QPoint &p)
{ {