diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 13:03:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 13:03:09 +0100 |
| commit | f94ca82e0ff6345648b499911411f2dcc1849267 (patch) | |
| tree | bc5acac8bfecaf5bccc612f5b009bf249bc69ef1 /src/corelib/tools/qlocale.cpp | |
| parent | fe29a6a6ebbf28505df7cdf1de24fa540fd3745e (diff) | |
| parent | b1092a7d4240d419cc2b5f3f5c326a1cb680bbdd (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ibfcb30053f3aacb8ec2ec480e146538c9bf440ea
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 51b886b0e0..86b73bf634 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -2371,6 +2371,8 @@ QString QLocale::toString(double i, char f, int prec) const QLocale QLocale::system() { QT_PREPEND_NAMESPACE(systemData)(); // trigger updating of the system data if necessary + if (systemLocalePrivate.isDestroyed()) + return QLocale(QLocale::C); return QLocale(*systemLocalePrivate->data()); } |