diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-09 10:34:33 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-09 10:34:33 +0100 |
commit | bc07958f922519bca1acc5930498ee0273576699 (patch) | |
tree | d5fda8e4458c2543458dbaeb7f4830c6d4750954 /src/gui/text/qtextdocument.cpp | |
parent | b01a53fe328b37324c6e3ab38c50f156c93c6afe (diff) | |
parent | dec7961709c90f6977d2447f7fa6c6625af41cb2 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
qmake/Makefile.unix
src/gui/text/qtextdocument.cpp
src/gui/text/qtextdocument.h
Change-Id: Iba26da0ecbf2aa4ff4b956391cfb373f977f88c9
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
-rw-r--r-- | src/gui/text/qtextdocument.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 5d88530e65..6ca4bc8209 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -51,7 +51,9 @@ #include <qregularexpression.h> #endif #include <qvarlengtharray.h> +#if QT_CONFIG(textcodec) #include <qtextcodec.h> +#endif #include <qthread.h> #include <qcoreapplication.h> #include <qmetaobject.h> @@ -209,7 +211,7 @@ QString Qt::convertFromPlainText(const QString &plain, Qt::WhiteSpaceMode mode) This function is defined in the \c <QTextDocument> header file. */ -#ifndef QT_NO_TEXTCODEC +#if QT_CONFIG(textcodec) QTextCodec *Qt::codecForHtml(const QByteArray &ba) { return QTextCodec::codecForHtml(ba); |