summaryrefslogtreecommitdiffstats
path: root/qmake/library
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/library')
-rw-r--r--qmake/library/qmakevfs.cpp8
-rw-r--r--qmake/library/qmakevfs.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/qmake/library/qmakevfs.cpp b/qmake/library/qmakevfs.cpp
index 3a54ef4023..9fd6ae470c 100644
--- a/qmake/library/qmakevfs.cpp
+++ b/qmake/library/qmakevfs.cpp
@@ -35,7 +35,7 @@ using namespace QMakeInternal;
#include <qfile.h>
#include <qfileinfo.h>
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
#include <qtextcodec.h>
#endif
@@ -49,7 +49,7 @@ QMakeVfs::QMakeVfs()
, m_magicExisting(fL1S("existing"))
#endif
{
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
m_textCodec = 0;
#endif
ref();
@@ -236,7 +236,7 @@ QMakeVfs::ReadResult QMakeVfs::readFile(int id, QString *contents, QString *errS
return ReadOtherError;
}
*contents =
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
m_textCodec ? m_textCodec->toUnicode(bcont) :
#endif
QString::fromLocal8Bit(bcont);
@@ -290,7 +290,7 @@ void QMakeVfs::invalidateContents()
}
#endif
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
void QMakeVfs::setTextCodec(const QTextCodec *textCodec)
{
m_textCodec = textCodec;
diff --git a/qmake/library/qmakevfs.h b/qmake/library/qmakevfs.h
index 68c21a3d37..fccbcfb765 100644
--- a/qmake/library/qmakevfs.h
+++ b/qmake/library/qmakevfs.h
@@ -38,7 +38,7 @@
# include <qmutex.h>
#endif
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
QT_FORWARD_DECLARE_CLASS(QTextCodec)
#endif
@@ -92,7 +92,7 @@ public:
void invalidateContents();
#endif
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
void setTextCodec(const QTextCodec *textCodec);
#endif
@@ -129,7 +129,7 @@ private:
QString m_magicMissing;
QString m_magicExisting;
#endif
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
const QTextCodec *m_textCodec;
#endif
};