Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1

 Conflicts:
	.qmake.conf

Change-Id: I208e2e1d8da2123359be0581c83557e862465247

1 files changed, 1 insertions, 1 deletions

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: