diff options
Diffstat (limited to 'src/corelib/codecs/qiconvcodec_p.h')
-rw-r--r-- | src/corelib/codecs/qiconvcodec_p.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/corelib/codecs/qiconvcodec_p.h b/src/corelib/codecs/qiconvcodec_p.h index 238351bc81..9b8500538b 100644 --- a/src/corelib/codecs/qiconvcodec_p.h +++ b/src/corelib/codecs/qiconvcodec_p.h @@ -54,13 +54,9 @@ #include <QtCore/private/qglobal_p.h> #include "qtextcodec.h" -#if defined(Q_OS_UNIX) && !defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) +QT_REQUIRE_CONFIG(iconv); -#ifdef Q_OS_MAC -typedef void * iconv_t; -#else #include <iconv.h> -#endif QT_BEGIN_NAMESPACE @@ -100,6 +96,4 @@ public: QT_END_NAMESPACE -#endif // Q_OS_UNIX && !QT_NO_ICONV && !QT_BOOTSTRAPPED - #endif // QICONVCODEC_P_H |