summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-05-14 19:35:09 +0200
committerLars Knoll <lars.knoll@qt.io>2020-05-15 22:07:51 +0200
commitf8f067f1d8fd9b07039f91df1c784ee25f71ef2b (patch)
tree8550c42e6e788b88c853a210b37dac7f2fde26a1
parente24792ac4709abfd9c69de0579269236274f0e78 (diff)
downloadqtsvg-f8f067f1d8fd9b07039f91df1c784ee25f71ef2b.tar.gz
Remove QTextCodec dependency from QtSvg
QTextStream writes in UTF-8 by default now anyway. Change-Id: Idb94484b888bfe21231fe3f34b33eaab1d33ef78 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
-rw-r--r--src/svg/qsvggenerator.cpp4
-rw-r--r--tests/auto/qsvggenerator/tst_qsvggenerator.cpp2
2 files changed, 0 insertions, 6 deletions
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 59dd7fc..4351171 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -48,7 +48,6 @@
#include "private/qdrawhelper_p.h"
#include "qfile.h"
-#include "qtextcodec.h"
#include "qtextstream.h"
#include "qbuffer.h"
#include "qmath.h"
@@ -938,9 +937,6 @@ bool QSvgPaintEngine::end()
*d->stream << "</defs>\n";
d->stream->setDevice(d->outputDevice);
-#ifndef QT_NO_TEXTCODEC
- d->stream->setCodec(QTextCodec::codecForName("UTF-8"));
-#endif
*d->stream << d->header;
*d->stream << d->defs;
diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
index 9217a5b..1ad729c 100644
--- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
+++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
@@ -291,8 +291,6 @@ void tst_QSvgGenerator::radialGradient()
void tst_QSvgGenerator::fileEncoding()
{
- QTextCodec::setCodecForLocale(QTextCodec::codecForName("ISO-8859-1"));
-
QByteArray byteArray;
QBuffer buffer(&byteArray);