2 files changed, 30 insertions, 1 deletions
diff --git a/qmake/library/qmakevfs.cpp b/qmake/library/qmakevfs.cpp
index 16e21395ba..2239a2beec 100644
--- a/qmake/library/qmakevfs.cpp
+++ b/qmake/library/qmakevfs.cpp
@@ -35,6 +35,10 @@ using namespace QMakeInternal;
 #include <qfile.h>
 #include <qfileinfo.h>
 
+#ifndef QT_NO_TEXTCODEC
+#include <qtextcodec.h>
+#endif
+
 #define fL1S(s) QString::fromLatin1(s)
 
 QT_BEGIN_NAMESPACE
@@ -45,6 +49,9 @@ QMakeVfs::QMakeVfs()
     , m_magicExisting(fL1S("existing"))
 #endif
 {
+#ifndef QT_NO_TEXTCODEC
+    m_textCodec = 0;
+#endif
 }
 
 #ifdef PROPARSER_THREAD_SAFE
@@ -211,7 +218,11 @@ QMakeVfs::ReadResult QMakeVfs::readFile(int id, QString *contents, QString *errS
         *errStr = fL1S("Unexpected UTF-8 BOM");
         return ReadOtherError;
     }
-    *contents = QString::fromLocal8Bit(bcont);
+    *contents =
+#ifndef QT_NO_TEXTCODEC
+        m_textCodec ? m_textCodec->toUnicode(bcont) :
+#endif
+        QString::fromLocal8Bit(bcont);
     return ReadOk;
 }
 
@@ -262,4 +273,11 @@ void QMakeVfs::invalidateContents()
 }
 #endif
 
+#ifndef QT_NO_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 3b69b60bee..1217225471 100644
--- a/qmake/library/qmakevfs.h
+++ b/qmake/library/qmakevfs.h
@@ -38,6 +38,10 @@
 # include <qmutex.h>
 #endif
 
+#ifndef QT_NO_TEXTCODEC
+QT_FORWARD_DECLARE_CLASS(QTextCodec)
+#endif
+
 #ifdef PROEVALUATOR_DUAL_VFS
 # ifndef PROEVALUATOR_CUMULATIVE
 #  error PROEVALUATOR_DUAL_VFS requires PROEVALUATOR_CUMULATIVE
@@ -85,6 +89,10 @@ public:
     void invalidateContents();
 #endif
 
+#ifndef QT_NO_TEXTCODEC
+    void setTextCodec(const QTextCodec *textCodec);
+#endif
+
 private:
 #ifdef PROEVALUATOR_THREAD_SAFE
     static QMutex s_mutex;
@@ -117,6 +125,9 @@ private:
     QString m_magicMissing;
     QString m_magicExisting;
 #endif
+#ifndef QT_NO_TEXTCODEC
+    const QTextCodec *m_textCodec;
+#endif
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QMakeVfs::VfsFlags)