summaryrefslogtreecommitdiffstats
path: root/examples/widgets
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-11-18 11:34:53 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-11-19 17:27:30 +0100
commitd3ba1b321b23eb807e3af9bfaa3a0db6d7a153c7 (patch)
tree80aa1c340a18b141b7b4db0fc867e0045e01e7c3 /examples/widgets
parentdc54f5f420fa6bd48693a6ae758b148de780c1c8 (diff)
i18n example: No longer ignore return value of QTranslator.load()
Adapt to qtbase/86ebe46f591d33dc76e2f764524c988dd72f4437. Change-Id: Ie45d43b3eabe60195622d69458e3d881139f9ce1 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples/widgets')
-rw-r--r--examples/widgets/tools/i18n/languagechooser.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/examples/widgets/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp
index 2f82fc678b..18f6c7bbcf 100644
--- a/examples/widgets/tools/i18n/languagechooser.cpp
+++ b/examples/widgets/tools/i18n/languagechooser.cpp
@@ -129,8 +129,11 @@ void LanguageChooser::checkBoxToggled()
MainWindow *window = mainWindowForCheckBoxMap.value(checkBox);
if (!window) {
QTranslator translator;
- translator.load(qmFileForCheckBoxMap.value(checkBox));
- qApp->installTranslator(&translator);
+ const QString qmlFile = qmFileForCheckBoxMap.value(checkBox);
+ if (translator.load(qmlFile))
+ QCoreApplication::installTranslator(&translator);
+ else
+ qWarning("Unable to load %s", qPrintable(QDir::toNativeSeparators(qmlFile)));
window = new MainWindow;
window->setPalette(colorForLanguage(checkBox->text()));
@@ -166,8 +169,10 @@ QStringList LanguageChooser::findQmFiles()
QString LanguageChooser::languageName(const QString &qmFile)
{
QTranslator translator;
- translator.load(qmFile);
-
+ if (!translator.load(qmFile)) {
+ qWarning("Unable to load %s", qPrintable(QDir::toNativeSeparators(qmFile)));
+ return {};
+ }
return translator.translate("MainWindow", "English");
}