diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 01:01:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 01:01:20 +0200 |
| commit | 4e40c54a3caabb6bced27e18e040ee88b739a3c8 (patch) | |
| tree | bf33b7207326f516a119e72ca1c5e02e248206e0 /examples/widgets | |
| parent | fbda189e081e6c7abf82334c0ac71b16ec2c37dd (diff) | |
| parent | 9e59024bf80124dbf301e8b3dca3dc4548fee428 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I77ba01f09b3dbcaf13cb265a70d9da661c32a61f
Diffstat (limited to 'examples/widgets')
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/widgets/dialogs/classwizard/main.cpp b/examples/widgets/dialogs/classwizard/main.cpp index 03ffe97a23..221e81aae4 100644 --- a/examples/widgets/dialogs/classwizard/main.cpp +++ b/examples/widgets/dialogs/classwizard/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); #ifndef QT_NO_TRANSLATION - QString translatorFileName = QLatin1String("qt_"); + QString translatorFileName = QLatin1String("qtbase_"); translatorFileName += QLocale::system().name(); QTranslator *translator = new QTranslator(&app); if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) diff --git a/examples/widgets/dialogs/licensewizard/main.cpp b/examples/widgets/dialogs/licensewizard/main.cpp index ed46e792d0..112fcc7aa0 100644 --- a/examples/widgets/dialogs/licensewizard/main.cpp +++ b/examples/widgets/dialogs/licensewizard/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); #ifndef QT_NO_TRANSLATION - QString translatorFileName = QLatin1String("qt_"); + QString translatorFileName = QLatin1String("qtbase_"); translatorFileName += QLocale::system().name(); QTranslator *translator = new QTranslator(&app); if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) diff --git a/examples/widgets/dialogs/standarddialogs/main.cpp b/examples/widgets/dialogs/standarddialogs/main.cpp index a0cded4f47..f7417f0e45 100644 --- a/examples/widgets/dialogs/standarddialogs/main.cpp +++ b/examples/widgets/dialogs/standarddialogs/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) QGuiApplication::setApplicationDisplayName(Dialog::tr("Standard Dialogs")); #ifndef QT_NO_TRANSLATION - QString translatorFileName = QLatin1String("qt_"); + QString translatorFileName = QLatin1String("qtbase_"); translatorFileName += QLocale::system().name(); QTranslator *translator = new QTranslator(&app); if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) diff --git a/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp index ce13a59b0c..75a373f990 100644 --- a/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp +++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); #ifndef QT_NO_TRANSLATION - QString translatorFileName = QLatin1String("qt_"); + QString translatorFileName = QLatin1String("qtbase_"); translatorFileName += QLocale::system().name(); QTranslator *translator = new QTranslator(&app); if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) |