Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp

Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074

2 files changed, 18 insertions, 10 deletions

diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index d507751d5e..f8fe671a2b 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -112,15 +112,15 @@ static QByteArray localHostName()
 */
 static QComposeCacheFileHeader readFileMetadata(const QString &path)
 {
-    QComposeCacheFileHeader info;
-    info.reserved = 0;
-    info.fileSize = 0;
+    quint64 fileSize = 0;
+    qint64 lastModified = 0;
     const QByteArray pathBytes = QFile::encodeName(path);
     QT_STATBUF st;
-    if (QT_STAT(pathBytes.data(), &st) != 0)
-        return info;
-    info.lastModified = st.st_mtime;
-    info.fileSize = st.st_size;
+    if (QT_STAT(pathBytes.data(), &st) == 0) {
+        lastModified = st.st_mtime;
+        fileSize = st.st_size;
+    }
+    QComposeCacheFileHeader info = { 0, 0, fileSize, lastModified };
     return info;
 }
 
diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
index d17abbb65a..857f437661 100644
--- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
@@ -168,11 +168,19 @@ bool QComposeInputContext::checkComposeTable()
         TableGenerator reader;
         m_tableState = reader.tableState();
 
-        if ((m_tableState & TableGenerator::NoErrors) == TableGenerator::NoErrors)
-            m_composeTable = reader.composeTable();
-
         m_compositionTableInitialized = true;
+        if ((m_tableState & TableGenerator::NoErrors) == TableGenerator::NoErrors) {
+            m_composeTable = reader.composeTable();
+        } else {
+#ifdef DEBUG_COMPOSING
+            qDebug( "### FAILED_PARSING ###" );
+#endif
+            // if we have errors, don' try to look things up anyways.
+            reset();
+            return false;
+        }
     }
+    Q_ASSERT(!m_composeTable.isEmpty());
     QVector<QComposeTableElement>::const_iterator it =
             std::lower_bound(m_composeTable.constBegin(), m_composeTable.constEnd(), m_composeBuffer, Compare());