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

Conflicts:
	src/gui/painting/painting.pri
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
	tests/auto/corelib/tools/qlocale/test/test.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
	tools/configure/environment.cpp

Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495

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 ad9877eb25..4126456f90 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -263,11 +263,11 @@ QString TableGenerator::findComposeFile()
 {
     // check if XCOMPOSEFILE points to a Compose file
     if (qEnvironmentVariableIsSet("XCOMPOSEFILE")) {
-        QString path(qgetenv("XCOMPOSEFILE"));
-        if (path.endsWith(QLatin1String("Compose")))
+        const QString path = QFile::decodeName(qgetenv("XCOMPOSEFILE"));
+        if (QFile::exists(path))
             return path;
         else
-            qWarning("Qt Warning: XCOMPOSEFILE doesn't point to a valid Compose file");
+            qWarning("$XCOMPOSEFILE doesn't point to an existing file");
     }
 
     // check if user’s home directory has a file named .XCompose