diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-23 17:25:44 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-25 01:54:27 +0200 |
| commit | 75cb66c04e8805a047a2f50e3e586d464dc7d1bc (patch) | |
| tree | 368ccc1b58d3debe5f1c3dc7b45c038678e1bf40 | |
| parent | c0c5b47a47f21143fd1bdeff92221ba3326a1dd5 (diff) | |
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>
| -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 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 { |