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

Conflicts:
	config.tests/unix/compile.test
	src/plugins/platforms/cocoa/qcocoahelpers.mm
	src/tools/qlalr/cppgenerator.cpp

Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index 81d605933a..52d14e5324 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -279,7 +279,7 @@ QString TableGenerator::findComposeFile()
     // check if user’s home directory has a file named .XCompose
     if (cleanState()) {
         QString path = qgetenv("HOME") + QStringLiteral("/.XCompose");
-        if (QFile(path).exists())
+        if (QFile::exists(path))
             return path;
     }
 
@@ -292,7 +292,7 @@ QString TableGenerator::findComposeFile()
                 m_state = UnsupportedLocale;
             else {
                 QString path = QDir(systemComposeDir()).filePath(table);
-                if (QFile(path).exists())
+                if (QFile::exists(path))
                     return path;
             }
         }
@@ -314,7 +314,7 @@ bool TableGenerator::findSystemComposeDir()
     bool found = false;
     for (int i = 0; i < m_possibleLocations.size(); ++i) {
         QString path = m_possibleLocations.at(i);
-        if (QFile(path + QLatin1String("/compose.dir")).exists()) {
+        if (QFile::exists(path + QLatin1String("/compose.dir"))) {
             m_systemComposeDir = path;
             found = true;
             break;