OSDN Git Service

fix potential breakage in QString
authorIvailo Monev <xakepa10@gmail.com>
Mon, 15 Feb 2016 23:07:36 +0000 (01:07 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Mon, 15 Feb 2016 23:07:36 +0000 (01:07 +0200)
upstream commits:
https://github.com/qtproject/qtbase/commit/c06106f28db343a090869b7d0f8638aa89f91640

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/core/tools/qstring.cpp

index 7380496..059f385 100644 (file)
@@ -6698,7 +6698,7 @@ QString QString::arg(qlonglong a, int fieldWidth, int base, const QChar &fillCha
     QString locale_arg;
     if (d.locale_occurrences > 0) {
         QLocale locale;
-        if (!locale.numberOptions() & QLocale::OmitGroupSeparator)
+        if (!(locale.numberOptions() & QLocale::OmitGroupSeparator))
             flags |= QLocalePrivate::ThousandsGroup;
         locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, flags);
     }
@@ -6742,7 +6742,7 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, const QChar &fillCh
     QString locale_arg;
     if (d.locale_occurrences > 0) {
         QLocale locale;
-        if (!locale.numberOptions() & QLocale::OmitGroupSeparator)
+        if (!(locale.numberOptions() & QLocale::OmitGroupSeparator))
             flags |= QLocalePrivate::ThousandsGroup;
         locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, flags);
     }
@@ -6877,7 +6877,7 @@ QString QString::arg(double a, int fieldWidth, char fmt, int prec, const QChar &
     if (d.locale_occurrences > 0) {
         QLocale locale;
 
-        if (!locale.numberOptions() & QLocale::OmitGroupSeparator)
+        if (!(locale.numberOptions() & QLocale::OmitGroupSeparator))
             flags |= QLocalePrivate::ThousandsGroup;
         locale_arg = locale.d()->doubleToString(a, prec, form, fieldWidth, flags);
     }