diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-04-30 09:39:16 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-04-30 10:59:56 +0000 |
| commit | 1eeabc6652220ff263eaa63872cd52c1693cbf69 (patch) | |
| tree | 60fd538fdf6019a0e39c24d1f9586a42f6b8a2aa /src | |
| parent | 042b118cafc68c677e9eafa7f718a025a34940da (diff) | |
Don't output a warning that can trigger before Qt has fully initialized
If a warning is outputted before Qt has had a chance to initialize the
logging rules then it will cause it to hang as it will be stuck trying
to initialize but can't continue because it needs to output the warning
which triggered during that initialization. Therefore the warning should
not be outputted to avoid this from happening.
Change-Id: I202752c377bf69def2f7fb76be71b78d00ad3fd5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 60bfac62ab..e74b825774 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -763,8 +763,6 @@ 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); } res = sys_locale->query(QSystemLocale::ZeroDigit, QVariant()); |