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, 4 insertions, 4 deletions

diff --git a/util/glgen/codegenerator.cpp b/util/glgen/codegenerator.cpp
index e06fe7e2f2..70cd3a7931 100644
--- a/util/glgen/codegenerator.cpp
+++ b/util/glgen/codegenerator.cpp
@@ -384,11 +384,11 @@ QString CodeGenerator::passByType(const Argument &arg) const
 
 QString CodeGenerator::safeArgumentName(const QString& arg) const
 {
-    if (arg == QStringLiteral("near")) // MS Windows defines near and far
+    if (arg == QLatin1String("near")) // MS Windows defines near and far
         return QStringLiteral("nearVal");
-    else if (arg == QStringLiteral("far"))
+    else if (arg == QLatin1String("far"))
         return QStringLiteral("farVal");
-    else if (arg == QStringLiteral("d"))
+    else if (arg == QLatin1String("d"))
         return QStringLiteral("dd"); // Don't shadow d pointer
     else
         return arg;
@@ -805,7 +805,7 @@ void CodeGenerator::writeInlineFunction(QTextStream &stream, const QString &clas
         argumentNames.append(safeArgumentName(arg.name));
     QString argNames = argumentNames.join(", ");
 
-    if (f.returnType == QStringLiteral("void"))
+    if (f.returnType == QLatin1String("void"))
         stream << QString(QStringLiteral("    %1->%2(%3);")).arg(backendVar).arg(f.name).arg(argNames) << endl;
     else
         stream << QString(QStringLiteral("    return %1->%2(%3);")).arg(backendVar).arg(f.name).arg(argNames) << endl;