diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-02 12:59:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-07 13:19:54 +0000 |
| commit | 825f98815683faea06144ab0262129b0367798ee (patch) | |
| tree | 48b10de0d86c6312d07700eb4e690dbd87ab8db0 /src/widgets/kernel | |
| parent | b5d249f9538bf3dc44f11879c2244deb5a37bf97 (diff) | |
Modernize the "textcodec" feature
Also clean up QTextCodec usage in qmake build and some includes
of qtextcodec.h.
Change-Id: I0475b82690024054add4e85a8724c8ea3adcf62a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/kernel/qt_widgets_pch.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index ba315d4338..b71efabcc9 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -58,7 +58,6 @@ #include "qstyle.h" #include "qstyleoption.h" #include "qstylefactory.h" -#include "qtextcodec.h" #include "qtooltip.h" #include "qtranslator.h" #include "qvariant.h" diff --git a/src/widgets/kernel/qt_widgets_pch.h b/src/widgets/kernel/qt_widgets_pch.h index 924a68d62e..bec6536637 100644 --- a/src/widgets/kernel/qt_widgets_pch.h +++ b/src/widgets/kernel/qt_widgets_pch.h @@ -63,7 +63,9 @@ #include <qregexp.h> #include <qstring.h> #include <qstringlist.h> +#if QT_CONFIG(textcodec) #include <qtextcodec.h> +#endif #include <qapplication.h> #include <qbitmap.h> |