diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-07 09:21:35 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-06 15:21:33 +0000 |
commit | 436601fa366eff599efda589ad13697f846b99c6 (patch) | |
tree | 405ef24f4db19eef20e66c3a13ad022118b6bb41 /examples | |
parent | b578a2992f0eaedcdffefce30d22eefe37dd8698 (diff) |
Improve translations loading code in standarddialogs example
Change-Id: I799724b633f1b52675ca2aa69b22fdb678b84421
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 74515a7a30b809a3ab0a2d67496e870ea3c872e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/widgets/dialogs/standarddialogs/main.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/examples/widgets/dialogs/standarddialogs/main.cpp b/examples/widgets/dialogs/standarddialogs/main.cpp index 3892c02f9d..7e7a5ce95b 100644 --- a/examples/widgets/dialogs/standarddialogs/main.cpp +++ b/examples/widgets/dialogs/standarddialogs/main.cpp @@ -60,16 +60,17 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - QGuiApplication::setApplicationDisplayName(Dialog::tr("Standard Dialogs")); -#ifndef QT_NO_TRANSLATION - QString translatorFileName = QLatin1String("qtbase_"); - translatorFileName += QLocale::system().name(); - QTranslator *translator = new QTranslator(&app); - if (translator->load(translatorFileName, QLibraryInfo::path(QLibraryInfo::TranslationsPath))) - app.installTranslator(translator); +#if QT_CONFIG(translation) + QTranslator translator; + if (translator.load(QLocale::system(), u"qtbase"_qs, u"_"_qs, + QLibraryInfo::path(QLibraryInfo::TranslationsPath))) { + app.installTranslator(&translator); + } #endif + QGuiApplication::setApplicationDisplayName(Dialog::tr("Standard Dialogs")); + Dialog dialog; if (!QGuiApplication::styleHints()->showIsFullScreen() && !QGuiApplication::styleHints()->showIsMaximized()) { const QRect availableGeometry = dialog.screen()->availableGeometry(); |