diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-10-25 13:29:09 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 22:14:10 +0200 |
| commit | 87b1ca756c589bbc679ac7e31f7d0d9704a0b064 (patch) | |
| tree | 4e825b866f1487052a124102e42c352a6f74c49b /src/corelib/tools | |
| parent | 15a2ed4e1db4409a05bb31993156455e35a40991 (diff) | |
Silence warning from clang
../../corelib/tools/qlocale_mac.mm:78:13: warning: '&&' within '||'
[-Wlogical-op-parentheses]
...&& !qt_splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry)...
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../corelib/tools/qlocale_mac.mm:78:13: note: place parentheses around the
'&&' expression to silence this warning
&& !qt_splitLocaleName(QString::fromLocal8Bit(result), ...
^
Change-Id: I64f745e7dfa64f28f264667372ed64f9e34ca3b7
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index 89191418d3..82b6b00e5e 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -74,8 +74,8 @@ static QByteArray getMacLocaleName() QByteArray result = envVarLocale(); QString lang, script, cntry; - if (result.isEmpty() || result != "C" - && !qt_splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry)) { + if (result.isEmpty() + || (result != "C" && !qt_splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry))) { QCFType<CFLocaleRef> l = CFLocaleCopyCurrent(); CFStringRef locale = CFLocaleGetIdentifier(l); result = QCFString::toQString(locale).toUtf8(); |