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

Conflicts:
	src/corelib/io/qfilesystemwatcher_win.cpp
	src/corelib/plugin/plugin.pri
	src/plugins/platforms/cocoa/qcocoaaccessibility.mm
	tests/auto/corelib/tools/qlocale/tst_qlocale.cpp

Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1

6 files changed, 13 insertions, 13 deletions

diff --git a/qmake/generators/win32/cesdkhandler.cpp b/qmake/generators/win32/cesdkhandler.cpp
index e0b5adb99a..f45cbf74a9 100644
--- a/qmake/generators/win32/cesdkhandler.cpp
+++ b/qmake/generators/win32/cesdkhandler.cpp
@@ -142,7 +142,7 @@ bool CeSdkHandler::parseMsBuildFile(QFile *file, CeSdkInfo *info)
         QSettings sdkRootPathRegistry(regString, QSettings::NativeFormat);
         const QString erg = sdkRootPathRegistry.value(QStringLiteral(".")).toString();
         const QString fullSdkRootPath = erg + sdkRootPath.mid(endIndex + 1);
-        const QString rootString = QStringLiteral("$(SdkRootPath)");
+        const QLatin1String rootString("$(SdkRootPath)");
 
         includePath = includePath.replace(rootString, fullSdkRootPath);
         libraryPath = libraryPath.replace(rootString, fullSdkRootPath);
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 3f150b5726..382b10c37b 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -46,7 +46,7 @@ QString MingwMakefileGenerator::escapeDependencyPath(const QString &path) const
 {
     QString ret = path;
     ret.replace('\\', "/");  // ### this shouldn't be here
-    ret.replace(' ', "\\ ");
+    ret.replace(' ', QLatin1String("\\ "));
     return ret;
 }
 
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 6485366f16..4539058cbf 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -323,7 +323,7 @@ static QString vcxCommandSeparator()
 static QString unquote(const QString &value)
 {
     QString result = value;
-    result.replace(QStringLiteral("\\\""), QStringLiteral("\""));
+    result.replace(QLatin1String("\\\""), QLatin1String("\""));
     return result;
 }
 
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 3c0b56cfeb..25a2765a01 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -49,7 +49,7 @@ static QString nmakePathList(const QStringList &list)
         pathList.append(QDir::cleanPath(path));
 
     return QDir::toNativeSeparators(pathList.join(QLatin1Char(';')))
-            .replace('#', QStringLiteral("^#")).replace('$', QStringLiteral("$$"));
+            .replace('#', QLatin1String("^#")).replace('$', QLatin1String("$$"));
 }
 
 NmakeMakefileGenerator::NmakeMakefileGenerator() : Win32MakefileGenerator(), usePCH(false)
@@ -327,7 +327,7 @@ QString NmakeMakefileGenerator::var(const ProKey &value) const
             QString precompRule = QString("-c -FI%1 -Yu%2 -Fp%3")
                     .arg(precompH_f, precompH_f, escapeFilePath(precompPch));
             QString p = MakefileGenerator::var(value);
-            p.replace("-c", precompRule);
+            p.replace(QLatin1String("-c"), precompRule);
             // Cannot use -Gm with -FI & -Yu, as this gives an
             // internal compiler error, on the newer compilers
             // ### work-around for a VS 2003 bug. Move to some prf file or remove completely.
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 6219252161..1b3b328243 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -697,12 +697,12 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
     }
     QString slnConf = _slnSolutionConf;
     if (!project->isEmpty("VCPROJ_ARCH")) {
-        slnConf.replace(QString("|Win32"), "|" + project->first("VCPROJ_ARCH"));
+        slnConf.replace(QLatin1String("|Win32"), "|" + project->first("VCPROJ_ARCH"));
     } else if (!project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH")) {
         QString slnPlatform = QString("|") + project->values("CE_SDK").join(' ') + " (" + project->first("CE_ARCH") + ")";
-        slnConf.replace(QString("|Win32"), slnPlatform);
+        slnConf.replace(QLatin1String("|Win32"), slnPlatform);
     } else if (is64Bit) {
-        slnConf.replace(QString("|Win32"), "|x64");
+        slnConf.replace(QLatin1String("|Win32"), QLatin1String("|x64"));
     }
     t << slnConf;
 
@@ -1698,12 +1698,12 @@ QString VcprojGenerator::replaceExtraCompilerVariables(
     if(defines.isEmpty())
         defines.append(varGlue("PRL_EXPORT_DEFINES"," -D"," -D","") +
                        varGlue("DEFINES"," -D"," -D",""));
-    ret.replace("$(DEFINES)", defines.first().toQString());
+    ret.replace(QLatin1String("$(DEFINES)"), defines.first().toQString());
 
     ProStringList &incpath = project->values("VCPROJ_MAKEFILE_INCPATH");
     if(incpath.isEmpty() && !this->var("MSVCPROJ_INCPATH").isEmpty())
         incpath.append(this->var("MSVCPROJ_INCPATH"));
-    ret.replace("$(INCPATH)", incpath.join(' '));
+    ret.replace(QLatin1String("$(INCPATH)"), incpath.join(' '));
 
     return ret;
 }
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index e7b57d46be..0846cb2d8f 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -398,7 +398,7 @@ void Win32MakefileGenerator::processRcFileVar()
             project->values("RC_FILE").first() = fi.absoluteFilePath();
         }
 
-        resFile.replace(".rc", Option::res_ext);
+        resFile.replace(QLatin1String(".rc"), Option::res_ext);
         project->values("RES_FILE").prepend(fileInfo(resFile).fileName());
         QString resDestDir;
         if (project->isActiveConfig("staticlib"))
@@ -768,8 +768,8 @@ QString Win32MakefileGenerator::escapeFilePath(const QString &path) const
 QString Win32MakefileGenerator::cQuoted(const QString &str)
 {
     QString ret = str;
-    ret.replace(QLatin1Char('\\'), QStringLiteral("\\\\"));
-    ret.replace(QLatin1Char('"'), QStringLiteral("\\\""));
+    ret.replace(QLatin1Char('\\'), QLatin1String("\\\\"));
+    ret.replace(QLatin1Char('"'), QLatin1String("\\\""));
     ret.prepend(QLatin1Char('"'));
     ret.append(QLatin1Char('"'));
     return ret;