From def0972bf32bb22d5123f409e17f9e92f3809bf4 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 23 Jan 2020 13:45:58 +0100 Subject: Stop using QDateTime's locale-specific APIs Use QLocale's date-time APIs, instead. Task-number: QTBUG-80441 Change-Id: I75453a002e0eea299d0527c0fa9431dc8bc53c7f Reviewed-by: Friedemann Kleint --- examples/quickcontrols/controls/filesystembrowser/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/quickcontrols/controls/filesystembrowser/main.cpp b/examples/quickcontrols/controls/filesystembrowser/main.cpp index d8599a2e..3a49215d 100644 --- a/examples/quickcontrols/controls/filesystembrowser/main.cpp +++ b/examples/quickcontrols/controls/filesystembrowser/main.cpp @@ -120,7 +120,7 @@ public: case DisplayableFilePermissionsRole: return QVariant(permissionString(fileInfo(index))); case LastModifiedRole: - return QVariant(fileInfo(index).lastModified().toString(Qt::SystemLocaleShortDate)); + return QVariant(QLocale::system().toString(fileInfo(index).lastModified(), QLocale::ShortFormat)); case UrlStringRole: return QVariant(QUrl::fromLocalFile(filePath(index)).toString()); default: -- cgit v1.2.1 From caecffab98cb2c47140579712e5b7bc7f7ce3070 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Sun, 2 Feb 2020 13:42:19 +0100 Subject: Bump version Change-Id: I2adee7799f1c8d762cdea06f9bcd4edb51d783ca --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index a3300d24..df2fb45e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.14.1 +MODULE_VERSION = 5.14.2 -- cgit v1.2.1