diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:36:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:39:20 +0100 |
| commit | 6755ec891a1740110c48895afd53d39e8370704a (patch) | |
| tree | 982606f3bc582262e4b315a63f55ccb141fff97b /src/corelib/codecs/qiconvcodec_p.h | |
| parent | 449204f8c0d6679ae0e58dbb8a30b8a86fbdb4ec (diff) | |
| parent | 00c9ec63a552d040e851b561c11428fabf1a2b08 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure
qmake/Makefile.unix.macos
qmake/Makefile.unix.win32
qmake/generators/win32/msvc_vcproj.cpp
src/3rdparty/pcre/qt_attribution.json
src/corelib/io/qsettings.cpp
src/corelib/kernel/qdeadlinetimer.cpp
src/platformsupport/kmsconvenience/qkmsdevice.cpp
src/platformsupport/kmsconvenience/qkmsdevice_p.h
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
tests/manual/qstorageinfo/printvolumes.cpp
tools/configure/configureapp.cpp
Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e
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 |