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

Conflicts:
	.qmake.conf

Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979

1 files changed, 8 insertions, 8 deletions

diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index af6b272fc6..dcb9709bb8 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -85,7 +85,7 @@ QVariantList findImportsInAst(QQmlJS::AST::UiHeaderItemList *headerItemList, con
         if (!importNode->fileName.isEmpty()) {
             QString name = importNode->fileName.toString();
             import[QStringLiteral("name")] = name;
-            if (name.endsWith(QStringLiteral(".js"))) {
+            if (name.endsWith(QLatin1String(".js"))) {
                 import[QStringLiteral("type")] = QStringLiteral("javascript");
             } else {
                 import[QStringLiteral("type")] = QStringLiteral("directory");
@@ -188,7 +188,7 @@ QVariantList findPathsForModuleImports(const QVariantList &imports)
 
     for (int i = 0; i < importsCopy.length(); ++i) {
         QVariantMap import = qvariant_cast<QVariantMap>(importsCopy[i]);
-        if (import[QStringLiteral("type")] == QStringLiteral("module")) {
+        if (import[QStringLiteral("type")] == QLatin1String("module")) {
             QString path = resolveImportPath(import.value(QStringLiteral("name")).toString(), import.value(QStringLiteral("version")).toString());
             if (!path.isEmpty())
                 import[QStringLiteral("path")] = path;
@@ -319,9 +319,9 @@ QVariantList findQmlImportsInFile(const QString &filePath)
         QFile f;
         if (f.open(stdin, QIODevice::ReadOnly))
             imports = findQmlImportsInQmlCode(QLatin1String("<stdin>"), QString::fromUtf8(f.readAll()));
-    } else if (filePath.endsWith(QStringLiteral(".qml"))) {
+    } else if (filePath.endsWith(QLatin1String(".qml"))) {
         imports = findQmlImportsInQmlFile(filePath);
-    } else if (filePath.endsWith(QStringLiteral(".js"))) {
+    } else if (filePath.endsWith(QLatin1String(".js"))) {
         imports = findQmlImportsInJavascriptFile(filePath);
     }
 
@@ -382,10 +382,10 @@ QVariantList findQmlImportsInDirectory(const QString &qmlDir)
             continue;
 
         // skip obvious build output directories
-        if (path.contains(QStringLiteral("Debug-iphoneos")) || path.contains(QStringLiteral("Release-iphoneos")) ||
-            path.contains(QStringLiteral("Debug-iphonesimulator")) || path.contains(QStringLiteral("Release-iphonesimulator"))
+        if (path.contains(QLatin1String("Debug-iphoneos")) || path.contains(QLatin1String("Release-iphoneos")) ||
+            path.contains(QLatin1String("Debug-iphonesimulator")) || path.contains(QLatin1String("Release-iphonesimulator"))
 #ifdef Q_OS_WIN
-            || path.contains(QStringLiteral("/release/")) || path.contains(QStringLiteral("/debug/"))
+            || path.contains(QLatin1String("/release/")) || path.contains(QLatin1String("/debug/"))
 #endif
         ){
             continue;
@@ -404,7 +404,7 @@ QSet<QString> importModulePaths(QVariantList imports) {
         QVariantMap import = qvariant_cast<QVariantMap>(importVariant);
         QString path = import.value(QStringLiteral("path")).toString();
         QString type = import.value(QStringLiteral("type")).toString();
-        if (type == QStringLiteral("module") && !path.isEmpty())
+        if (type == QLatin1String("module") && !path.isEmpty())
             ret.insert(QDir(path).canonicalPath());
     }
     return ret;