From 75cb66c04e8805a047a2f50e3e586d464dc7d1bc Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 23 Aug 2012 17:25:44 +0200 Subject: Don't define QT_NO_ICONV on Windows: that comes from qconfig.h Both the configure script and configure.exe add QT_NO_ICONV to qconfig.h in case they can't find iconv. Since Windows doesn't use iconv anyway, we don't need to set QT_NO_ICONV here. MSVC likes to print a warning that a macro is redefined. That gets quite spammy... Change-Id: Ide9800f6f848bc0c2d8bdbcb41875a709d3e249c Reviewed-by: Lars Knoll --- src/corelib/codecs/codecs.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/codecs/codecs.pri') diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index 0b40f795ad..34b5a87104 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 { + } else:!win32 { DEFINES += QT_NO_ICONV } win32 { -- cgit v1.2.3