diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-15 08:40:41 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-15 12:08:30 (GMT) |
| commit | 271358459d605e909f4ec093b971a420ff730e8f (patch) | |
| tree | 409bca4cd46a1ea000d583f229ffee468ef5e30f /src/corelib/tools | |
| parent | 1eafb5c771a10377216af0f2be873c08d6cd4e27 (diff) | |
| download | Qt-271358459d605e909f4ec093b971a420ff730e8f.zip Qt-271358459d605e909f4ec093b971a420ff730e8f.tar.gz Qt-271358459d605e909f4ec093b971a420ff730e8f.tar.bz2 | |
fix warnings for mingw in QtCore
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index fef1931..296d5a0 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -413,8 +413,8 @@ QByteArray getWinLocaleName(LCID id = LOCALE_USER_DEFAULT) result = envVarLocale(); QChar lang[3]; QChar cntry[2]; - if ( result == "C" || !result.isEmpty() - && splitLocaleName(QString::fromLocal8Bit(result), lang, cntry) ) { + if ( result == "C" || (!result.isEmpty() + && splitLocaleName(QString::fromLocal8Bit(result), lang, cntry)) ) { long id = 0; bool ok = false; id = qstrtoll(result.data(), 0, 0, &ok); diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index b160b90..7cca339 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -3480,7 +3480,7 @@ QByteArray QString::toAscii() const return toLatin1(); } -#ifndef Q_WS_MAC +#if !defined(Q_WS_MAC) && defined(Q_OS_UNIX) static QByteArray toLocal8Bit_helper(const QChar *data, int length) { #ifndef QT_NO_TEXTCODEC |