diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:01:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:01:51 +0100 |
| commit | c96ed0b5ed5d868de8fc24b6498d482564bbc1b7 (patch) | |
| tree | 15aa336274ab4ec6d8d0be21a351fd5ce43cdf98 /examples/quickcontrols/controls/filesystembrowser/main.cpp | |
| parent | 89751f0754fba5fcd71824b009fcf4aef911f3f4 (diff) | |
| parent | d286adc5c7c27fdbbb7887f3a77212a49726cede (diff) | |
| download | qtquickcontrols-c96ed0b5ed5d868de8fc24b6498d482564bbc1b7.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I3b9f858168f48c8479e6f394f8b87dda61e0adba
Diffstat (limited to 'examples/quickcontrols/controls/filesystembrowser/main.cpp')
| -rw-r--r-- | examples/quickcontrols/controls/filesystembrowser/main.cpp | 2 |
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: |