diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-10 11:36:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-10 11:38:40 +0100 |
| commit | 58437fb125f60c11ba8e97c914fa8db8c89c7373 (patch) | |
| tree | f47ed59073984ec76034155bc04d3d987b192d2e /src/corelib/global | |
| parent | 76bb804405f424708fffec502788995ea91206b8 (diff) | |
| parent | b20c15f2041205a1cab98fbaf9560a3e2e0d6367 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/serialization/qcborcommon.h
src/corelib/tools/qlocale_data_p.h
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: Ibed987f6d77a0294f78f67d78625237616082416
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 1 | ||||
| -rw-r--r-- | src/corelib/global/qt_pch.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index f6a5d6b1d4..224d162fb0 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -128,7 +128,6 @@ #define QT_NO_COMPRESS #define QT_JSON_READONLY #define QT_NO_STANDARDPATHS -#define QT_NO_TEXTCODEC #define QT_FEATURE_textcodec -1 #else #define QT_FEATURE_codecs -1 diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h index b3b526342d..76e46374c3 100644 --- a/src/corelib/global/qt_pch.h +++ b/src/corelib/global/qt_pch.h @@ -66,5 +66,7 @@ #include <qregexp.h> #include <qstring.h> #include <qstringlist.h> +#if QT_CONFIG(textcodec) #include <qtextcodec.h> #endif +#endif |