From 42d2d70abe9683e2d94e8f3aeab2856c0b39e1d8 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 28 Apr 2020 11:47:48 +0200
Subject: Remove textcodec codepaths in qmake

They were anyway unused since years

Change-Id: I559b5042f6b942d7a940ac374d2b2740f2d4dc12
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 qmake/library/qmakevfs.cpp | 20 +-------------------
 qmake/library/qmakevfs.h   | 11 -----------
 2 files changed, 1 insertion(+), 30 deletions(-)

(limited to 'qmake/library')

diff --git a/qmake/library/qmakevfs.cpp b/qmake/library/qmakevfs.cpp
index 1f77595535..3ccfcc78ee 100644
--- a/qmake/library/qmakevfs.cpp
+++ b/qmake/library/qmakevfs.cpp
@@ -35,10 +35,6 @@ using namespace QMakeInternal;
 #include <qfile.h>
 #include <qfileinfo.h>
 
-#if QT_CONFIG(textcodec)
-#include <qtextcodec.h>
-#endif
-
 #define fL1S(s) QString::fromLatin1(s)
 
 QT_BEGIN_NAMESPACE
@@ -49,9 +45,6 @@ QMakeVfs::QMakeVfs()
     , m_magicExisting(fL1S("existing"))
 #endif
 {
-#if QT_CONFIG(textcodec)
-    m_textCodec = 0;
-#endif
     ref();
 }
 
@@ -235,11 +228,7 @@ QMakeVfs::ReadResult QMakeVfs::readFile(int id, QString *contents, QString *errS
         *errStr = fL1S("Unexpected UTF-8 BOM");
         return ReadOtherError;
     }
-    *contents =
-#if QT_CONFIG(textcodec)
-        m_textCodec ? m_textCodec->toUnicode(bcont) :
-#endif
-        QString::fromLocal8Bit(bcont);
+    *contents = QString::fromLocal8Bit(bcont);
     return ReadOk;
 }
 
@@ -290,11 +279,4 @@ void QMakeVfs::invalidateContents()
 }
 #endif
 
-#if QT_CONFIG(textcodec)
-void QMakeVfs::setTextCodec(const QTextCodec *textCodec)
-{
-    m_textCodec = textCodec;
-}
-#endif
-
 QT_END_NAMESPACE
diff --git a/qmake/library/qmakevfs.h b/qmake/library/qmakevfs.h
index fccbcfb765..0c9a8dca36 100644
--- a/qmake/library/qmakevfs.h
+++ b/qmake/library/qmakevfs.h
@@ -38,10 +38,6 @@
 # include <qmutex.h>
 #endif
 
-#if QT_CONFIG(textcodec)
-QT_FORWARD_DECLARE_CLASS(QTextCodec)
-#endif
-
 #ifdef PROEVALUATOR_DUAL_VFS
 # ifndef PROEVALUATOR_CUMULATIVE
 #  error PROEVALUATOR_DUAL_VFS requires PROEVALUATOR_CUMULATIVE
@@ -92,10 +88,6 @@ public:
     void invalidateContents();
 #endif
 
-#if QT_CONFIG(textcodec)
-    void setTextCodec(const QTextCodec *textCodec);
-#endif
-
 private:
 #ifdef PROEVALUATOR_THREAD_SAFE
     static QMutex s_mutex;
@@ -129,9 +121,6 @@ private:
     QString m_magicMissing;
     QString m_magicExisting;
 #endif
-#if QT_CONFIG(textcodec)
-    const QTextCodec *m_textCodec;
-#endif
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QMakeVfs::VfsFlags)
-- 
cgit v1.2.3