summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2015-11-24 14:12:04 +0100
committerUlf Hermann <ulf.hermann@theqtcompany.com>2015-11-24 13:35:11 +0000
commit5c8c4d0b2127a5110e05fa4afa1b8883cc91a5df (patch)
tree01ecc8728a4ae4b7ef70131eddf5d727f9abf304 /src/corelib/kernel
parent4e39cbaa411540465a5dc72694bdee8a43c472e1 (diff)
Don't call setlocale(3) in bootstrap code
When bootstrapping we might rely on sscanf(3) for parsing doubles from strings. We don't want this to be localized. Task-number: QTBUG-49616 Change-Id: I1607bb750b479fd7007dd0d875d600be59caa859 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index e64ee04134..361bc0172d 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -565,7 +565,7 @@ void QCoreApplicationPrivate::initLocale()
if (qt_locale_initialized)
return;
qt_locale_initialized = true;
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(QT_BOOTSTRAPPED)
setlocale(LC_ALL, "");
#endif
}