diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
| commit | f510a51dace0cb39a93b057b8fcbcbdda33a956e (patch) | |
| tree | cd1dac8a78ecbb7579c59bf9f0b0d2d6fba56b4a /src/tools/uic/cpp/cppextractimages.cpp | |
| parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
| parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) | |
| download | qtbase-f510a51dace0cb39a93b057b8fcbcbdda33a956e.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'src/tools/uic/cpp/cppextractimages.cpp')
| -rw-r--r-- | src/tools/uic/cpp/cppextractimages.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/uic/cpp/cppextractimages.cpp b/src/tools/uic/cpp/cppextractimages.cpp index 22abd54283..4d06d08dae 100644 --- a/src/tools/uic/cpp/cppextractimages.cpp +++ b/src/tools/uic/cpp/cppextractimages.cpp @@ -33,7 +33,6 @@ #include "utils.h" #include "uic.h" -#include <qdatastream.h> #include <qtextstream.h> #include <qtextcodec.h> #include <qdir.h> @@ -77,7 +76,9 @@ void ExtractImages::acceptUI(DomUI *node) m_imagesDir = dir; m_output = new QTextStream(&f); +#ifndef QT_NO_TEXTCODEC m_output->setCodec(QTextCodec::codecForName("UTF-8")); +#endif QTextStream &out = *m_output; @@ -121,7 +122,9 @@ void ExtractImages::acceptImage(DomImage *image) if (isXPM_GZ) { QTextStream *imageOut = new QTextStream(&f); +#ifndef QT_NO_TEXTCODEC imageOut->setCodec(QTextCodec::codecForName("UTF-8")); +#endif CPP::WriteIconData::writeImage(*imageOut, QString(), m_option.limitXPM_LineLength, image); delete imageOut; |