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/corelib/codecs/qicucodec_p.h | |
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/corelib/codecs/qicucodec_p.h')
-rw-r--r-- | src/corelib/codecs/qicucodec_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/codecs/qicucodec_p.h b/src/corelib/codecs/qicucodec_p.h index 0c2dbe17d6..1cbe4d4e7a 100644 --- a/src/corelib/codecs/qicucodec_p.h +++ b/src/corelib/codecs/qicucodec_p.h @@ -59,9 +59,9 @@ extern "C" { typedef struct UConverter UConverter; } -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(textcodec); -#ifndef QT_NO_TEXTCODEC +QT_BEGIN_NAMESPACE class QIcuCodec : public QTextCodec { @@ -90,8 +90,6 @@ private: const char *m_name; }; -#endif // QT_NO_TEXTCODEC - QT_END_NAMESPACE #endif |