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/qjpunicode_p.h | |
| 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/qjpunicode_p.h')
| -rw-r--r-- | src/corelib/codecs/qjpunicode_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h index 4fa2b9f757..9d1cdf3bf0 100644 --- a/src/corelib/codecs/qjpunicode_p.h +++ b/src/corelib/codecs/qjpunicode_p.h @@ -82,9 +82,9 @@ #include <QtCore/private/qglobal_p.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(big_codecs); -#ifndef QT_NO_BIG_CODECS +QT_BEGIN_NAMESPACE class QJpUnicodeConv { public: @@ -180,8 +180,6 @@ private: int rule; }; -#endif // QT_NO_BIG_CODECS - QT_END_NAMESPACE #endif // QJPUNICODE_P_H |