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/widgets/widgets/qtextbrowser.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/widgets/widgets/qtextbrowser.cpp')
-rw-r--r-- | src/widgets/widgets/qtextbrowser.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index 46b973bae7..09541bb53b 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -47,7 +47,9 @@ #include <qdebug.h> #include <qabstracttextdocumentlayout.h> #include "private/qtextdocumentlayout_p.h" +#if QT_CONFIG(textcodec) #include <qtextcodec.h> +#endif #include <qpainter.h> #include <qdir.h> #if QT_CONFIG(whatsthis) @@ -293,7 +295,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url) if (data.type() == QVariant::String) { txt = data.toString(); } else if (data.type() == QVariant::ByteArray) { -#ifndef QT_NO_TEXTCODEC +#if QT_CONFIG(textcodec) QByteArray ba = data.toByteArray(); QTextCodec *codec = Qt::codecForHtml(ba); txt = codec->toUnicode(ba); |