diff options
| author | Rafael Roquetto <rafael.roquetto@kdab.com> | 2012-03-09 11:05:45 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-11 15:29:12 (GMT) |
| commit | 333df91b9be25a2365287f0cd6fcfc285b365ce2 (patch) | |
| tree | 079e88cc8ad15b9b834dd9c0b9be5307832506b8 /src/corelib | |
| parent | 0bbeb40e82dfbf98a09f3b32f042dfe34a2820c9 (diff) | |
| download | Qt-333df91b9be25a2365287f0cd6fcfc285b365ce2.zip Qt-333df91b9be25a2365287f0cd6fcfc285b365ce2.tar.gz Qt-333df91b9be25a2365287f0cd6fcfc285b365ce2.tar.bz2 | |
Fixed wrong iconv_open call under QNX
The wrong macro logic was causing iconv_open to never be
called under QNX.
cherry-picked from qt5/qtbase 8a15c41d36b1905a2
Change-Id: I0a1e3fb01d726daca637f8f51abfc924cd493311
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/codecs/qiconvcodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp index 3b15d11..eca332a 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -465,7 +465,7 @@ iconv_t QIconvCodec::createIconv_t(const char *to, const char *from) Q_ASSERT((to == 0 && from != 0) || (to != 0 && from == 0)); iconv_t cd = (iconv_t) -1; -#if defined(__GLIBC__) || defined(GNU_LIBICONV) +#if defined(__GLIBC__) || defined(GNU_LIBICONV) || defined(Q_OS_QNX) #if defined(Q_OS_QNX) // on QNX the default locale is UTF-8, and an empty string will cause iconv_open to fail static const char empty_codeset[] = "UTF-8"; |