From d50e3f94b5b7eea92a8a3bccad926897196c03f8 Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Wed, 15 Apr 2015 11:01:37 +0200 Subject: Do not throw on empty translation files Workaround for QTBUG-31031 (QTranslator::load returns false for empty translation-files) Change-Id: If4587b99c86a5afacada2d022af10460248ecf93 Reviewed-by: Kai Koehne --- src/libs/installer/component.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/libs/installer') diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 57a86748a..048cfeda6 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -557,9 +557,11 @@ void Component::loadTranslations(const QDir &directory, const QStringList &qms) } QScopedPointer translator(new QTranslator(this)); - if (!translator->load(filename)) - throw Error(tr("Could not open the requested translation file '%1'.").arg(filename)); - qApp->installTranslator(translator.take()); + if (translator->load(filename)) { + // Do not throw if translator returns false as it may just be an intentionally + // empty file. See also QTBUG-31031 + qApp->installTranslator(translator.take()); + } } } -- cgit v1.2.3