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

1 files changed, 4 insertions, 4 deletions

diff --git a/qmake/generators/xmloutput.cpp b/qmake/generators/xmloutput.cpp
index c1c8f5f493..e92749a126 100644
--- a/qmake/generators/xmloutput.cpp
+++ b/qmake/generators/xmloutput.cpp
@@ -136,11 +136,11 @@ QString XmlOutput::doConversion(const QString &text)
     }
 
     if (conversion == XMLConversion) {
-        output.replace('\"', """);
-        output.replace('\'', "'");
+        output.replace('\"', QLatin1String("""));
+        output.replace('\'', QLatin1String("'"));
     } else if (conversion == EscapeConversion) {
-        output.replace('\"', "\\\"");
-        output.replace('\'', "\\\'");
+        output.replace('\"', QLatin1String("\\\""));
+        output.replace('\'', QLatin1String("\\\'"));
     }
     return output;
 }