Skip to content

Commit

Permalink
Merge pull request #4 from seequent/LF-38131-fix-qt-locale-check
Browse files Browse the repository at this point in the history
LF-38131 Remove warning about decimal and grouping characters
  • Loading branch information
grantroch authored Dec 8, 2020
2 parents 552fd6d + ab168dd commit d0381dc
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/corelib/text/qlocale.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,10 @@ static void updateSystemPrivate()
const ushort group = res.toString().at(0).unicode();
if (group != globalLocaleData.m_decimal)
globalLocaleData.m_group = group;
else if (group == globalLocaleData.m_group)
qWarning("System-supplied decimal and grouping character are both 0x%hx", group);
// LF-38131 When the grouping character and decimal character are the same, this will prevent an app from opening as
// Qt is not fully initialised. So do not show this warning now (this was removed in future commits)
// else if (group == globalLocaleData.m_group)
// qWarning("System-supplied decimal and grouping character are both 0x%hx", group);
}

res = sys_locale->query(QSystemLocale::ZeroDigit, QVariant());
Expand Down

0 comments on commit d0381dc

Please sign in to comment.