Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I99af0bef7f1c931533a324ebcfb27c40ee871a5e

1 files changed, 2 insertions, 4 deletions

diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index 3d1b281620..692372c3a9 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -228,8 +228,7 @@ QByteArray TableGenerator::readLocaleAliases(const QByteArray &locale)
 {
     QFile aliases(systemComposeDir() + QLatin1String("/locale.alias"));
     QByteArray fullLocaleName;
-    if (aliases.exists()) {
-        aliases.open(QIODevice::ReadOnly);
+    if (aliases.open(QIODevice::ReadOnly)) {
         while (!aliases.atEnd()) {
             char l[1024];
             int read = aliases.readLine(l, sizeof(l));
@@ -268,8 +267,7 @@ QByteArray TableGenerator::readLocaleAliases(const QByteArray &locale)
 bool TableGenerator::processFile(QString composeFileName)
 {
     QFile composeFile(composeFileName);
-    if (composeFile.exists()) {
-        composeFile.open(QIODevice::ReadOnly);
+    if (composeFile.open(QIODevice::ReadOnly)) {
         parseComposeFile(&composeFile);
         return true;
     }