aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4dateobject.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2018-09-11 19:29:52 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2018-09-21 11:32:42 +0000
commit4f0ff0c152f65d7d1f255c4549167bb020d1c4f4 (patch)
tree3b7d32a9f0a4551f36c38c064fbda3f1d55cdd55 /src/qml/jsruntime/qv4dateobject.cpp
parentb593cc249b81060f6072e5a84386458c9fcc9d6e (diff)
Stop using deprecated Qt:LocaleDate
The Q(Date|Time)+::toString() methods to which it was passed all, at present, treat it the same as DefaultLocaleShortDate, so replace it with that. It's possible we should use the long format instead, but that would be a behavior change. Change-Id: I238ecd0bf0782f0c930ffee8bce23e2881922fed Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4dateobject.cpp')
-rw-r--r--src/qml/jsruntime/qv4dateobject.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
index df3bb37e9c..d8d428237b 100644
--- a/src/qml/jsruntime/qv4dateobject.cpp
+++ b/src/qml/jsruntime/qv4dateobject.cpp
@@ -670,17 +670,17 @@ static inline QString ToTimeString(double t)
static inline QString ToLocaleString(double t)
{
- return ToDateTime(t, Qt::LocalTime).toString(Qt::LocaleDate);
+ return ToDateTime(t, Qt::LocalTime).toString(Qt::DefaultLocaleShortDate);
}
static inline QString ToLocaleDateString(double t)
{
- return ToDateTime(t, Qt::LocalTime).date().toString(Qt::LocaleDate);
+ return ToDateTime(t, Qt::LocalTime).date().toString(Qt::DefaultLocaleShortDate);
}
static inline QString ToLocaleTimeString(double t)
{
- return ToDateTime(t, Qt::LocalTime).time().toString(Qt::LocaleDate);
+ return ToDateTime(t, Qt::LocalTime).time().toString(Qt::DefaultLocaleShortDate);
}
static double getLocalTZA()