diff options
| author | Lukas Geyer <lgeyer@gmx.at> | 2012-08-28 10:11:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-31 16:10:25 +0200 |
| commit | 9fcf8dc2e8fa2748b51750d14b6e6cd8352bd27e (patch) | |
| tree | b100d52904510979bc100a5dd6f46aa4b00c37f6 /src/corelib/codecs | |
| parent | ce4ed8315e8a1b346a431fcdd3310bc8ef91197e (diff) | |
Force QT_NO_ICONV on win32:!win32-msvc*
This behaviour was changed in Ide9800f6 to suppress
macro redefinition warnings for MSVC, but MinGW
has iconv support and therefore configure does not
set QT_NO_ICONV, which prevents compilation on win32-g++
as QIconvCodec does not support Windows.
Change-Id: Ic3c4ccceb3eaf9542c95b0c27847ca5ab51849b7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index 34b5a87104..86b330c589 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -54,7 +54,7 @@ contains(QT_CONFIG,icu) { SOURCES += codecs/qiconvcodec.cpp DEFINES += GNU_LIBICONV } - } else:!win32 { + } else:!win32-msvc* { DEFINES += QT_NO_ICONV } win32 { |