whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Bradley T. Hughes 2011-10-25 13:29:09 +02:00 committed by Qt by Nokia
parent 15a2ed4e1d
commit 87b1ca756c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qlocale_mac.mm
View File

@ -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();