diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:53 +0200 |
| commit | e28e91ae99b8c3859899e04cc9370534c7c7b86d (patch) | |
| tree | cca81b1e745be4f25aab78e8e917c2324594e539 /src/corelib/codecs/qtsciicodec.cpp | |
| parent | 5ea233ca6782eb27adf596515cb66ef3dadc1d5e (diff) | |
| parent | ebfad73b4e44fe6db8059200da105b4b87888718 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/animation/qpropertyanimation.cpp
src/gui/image/qicon.cpp
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
Diffstat (limited to 'src/corelib/codecs/qtsciicodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qtsciicodec.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp index 49f38d1789..936fc4206d 100644 --- a/src/corelib/codecs/qtsciicodec.cpp +++ b/src/corelib/codecs/qtsciicodec.cpp @@ -44,8 +44,6 @@ #include "qtsciicodec_p.h" #include "qlist.h" -#ifndef QT_NO_CODECS - QT_BEGIN_NAMESPACE static unsigned char qt_UnicodeToTSCII(ushort u1, ushort u2, ushort u3); @@ -493,5 +491,3 @@ static unsigned int qt_TSCIIToUnicode(uint code, uint *s) } QT_END_NAMESPACE - -#endif // QT_NO_CODECS |