diff options
author | Niels Weber <niels.weber@theqtcompany.com> | 2015-04-15 11:01:37 +0200 |
---|---|---|
committer | Niels Weber <niels.weber@theqtcompany.com> | 2015-04-15 10:24:33 +0000 |
commit | d50e3f94b5b7eea92a8a3bccad926897196c03f8 (patch) | |
tree | ddc4ffda7b6ef9c70375936b420cfefc98617ba3 /src/libs/installer | |
parent | f3e8ccafa5af6b6b52ff9ead30fa602c155cffcf (diff) |
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 <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/libs/installer')
-rw-r--r-- | src/libs/installer/component.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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<QTranslator> 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()); + } } } |