diff options
| author | hjk <hjk@qt.io> | 2020-06-19 18:49:17 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-06-22 06:43:39 +0000 |
| commit | e6d1f08642eff25749b7e07c4e8589e4aa2513bf (patch) | |
| tree | f4a55e37a7b24b67a0f1d9b813da8ab4db611e93 /src/plugins/coreplugin | |
| parent | 467fdead9fd7fcd81de9a6a10d380b59bc395e84 (diff) | |
Drop use of Qt::DefaultLocaleShortDate
Gone in Qt 6.
Task-number: QTCREATORBUG-24098
Change-Id: Ie9fe1858406133fed6987de0e0a38fe86de15caf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/coreplugin')
| -rw-r--r-- | src/plugins/coreplugin/coreplugin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index bb63869fa8..b2a6155077 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -180,9 +180,11 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) expander->registerVariable("CurrentTime:RFC", tr("The current time (RFC2822)."), []() { return QTime::currentTime().toString(Qt::RFC2822Date); }); expander->registerVariable("CurrentDate:Locale", tr("The current date (Locale)."), - []() { return QDate::currentDate().toString(Qt::DefaultLocaleShortDate); }); + []() { return QLocale::system() + .toString(QDate::currentDate(), QLocale::ShortFormat); }); expander->registerVariable("CurrentTime:Locale", tr("The current time (Locale)."), - []() { return QTime::currentTime().toString(Qt::DefaultLocaleShortDate); }); + []() { return QLocale::system() + .toString(QTime::currentTime(), QLocale::ShortFormat); }); expander->registerVariable("Config:DefaultProjectDirectory", tr("The configured default directory for projects."), []() { return DocumentManager::projectsDirectory().toString(); }); expander->registerVariable("Config:LastFileDialogDirectory", tr("The directory last visited in a file dialog."), |