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 <lars.knoll@nokia.com>
This commit is contained in:
Thiago Macieira 2012-08-23 17:25:44 +02:00 committed by Qt by Nokia
parent c0c5b47a47
commit 75cb66c04e

View File

@ -54,7 +54,7 @@ contains(QT_CONFIG,icu) {
SOURCES += codecs/qiconvcodec.cpp
DEFINES += GNU_LIBICONV
}
} else {
} else:!win32 {
DEFINES += QT_NO_ICONV
}
win32 {