path: root/src
diff options
authorMiikka Heikkinen <>2014-09-18 14:50:03 +0300
committerMiikka Heikkinen <>2014-09-18 15:11:07 +0300
commite26d82d56bc95d0e2b06bf41813e885486a2ea6c (patch)
treeb495952484a52b78a40f64b6e28e145e925348ff /src
parent682630e62d588dace079a717e6cd4e43275a2db4 (diff)
Misc fixes
- Default value for localizeNumbers is now false, as it would look weird if numbers were localized in otherwise unlocalized app. - Added locale property to qml ChartView. - Added registrations for latest revisions of all QML types for 2.0, since apparently this is necessary to make them visible when importing Charts 2.0 Change-Id: I46997b3af4458c6dbf6755a19e01115d5393013a Reviewed-by: Titta Heikkala <>
Diffstat (limited to 'src')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/axis/chartaxiselement.cpp b/src/axis/chartaxiselement.cpp
index 310555e7..c006b166 100644
--- a/src/axis/chartaxiselement.cpp
+++ b/src/axis/chartaxiselement.cpp
@@ -29,7 +29,7 @@
static const char *labelFormatMatchString = "%[\\-\\+#\\s\\d\\.lhjztL]*([dicuoxfegXFEG])";
-static const char *labelFormatMatchLocalizedString = "^([^%]*)%\\.?(\\d)*([defgiEG])(.*)$";
+static const char *labelFormatMatchLocalizedString = "^([^%]*)%\\.(\\d+)([defgiEG])(.*)$";
static QRegExp *labelFormatMatcher = 0;
static QRegExp *labelFormatMatcherLocalized = 0;
class StaticLabelFormatMatcherDeleter
diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp
index 619f400f..e83a7fbc 100644
--- a/src/chartpresenter.cpp
+++ b/src/chartpresenter.cpp
@@ -45,7 +45,7 @@ ChartPresenter::ChartPresenter(QChart *chart, QChart::ChartType type)
- m_localizeNumbers(true)
+ m_localizeNumbers(false)
if (type == QChart::ChartTypeCartesian)
m_layout = new CartesianChartLayout(this);
diff --git a/src/qchart.cpp b/src/qchart.cpp
index b103ed9b..16391b9a 100644
--- a/src/qchart.cpp
+++ b/src/qchart.cpp
When \c{true}, all generated numbers appearing in various series and axis labels will be
localized using the QLocale set with the locale property.
When \c{false}, the "C" locale is always used.
- Defaults to \c{true}.
+ Defaults to \c{false}.
\note This property doesn't affect QDateTimeAxis labels, which always use the QLocale set with
the locale property.