Tools: use QLibraryInfo::paths()

Quite a few of these were simply an addition of "s".

Pick-to: 6.12
Change-Id: I16caba2f78fe1180c8e7fffd699e95bd8cafb2dc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

6 files changed, 19 insertions, 9 deletions

diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 096b8abb73..eec5b5b802 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -281,7 +281,7 @@ int main(int argc, char **argv)
                 importPaths.append(parser.values(importPathOption));
 
             if (!parser.isSet(bareOption))
-                importPaths.append(QLibraryInfo::path(QLibraryInfo::QmlImportsPath));
+                importPaths.append(QLibraryInfo::paths(QLibraryInfo::QmlImportsPath));
 
             QQmlJSImporter importer(
                         importPaths, parser.isSet(resourceOption) ? &fileMapper : nullptr);
diff --git a/tools/qmldom/qmldomtool.cpp b/tools/qmldom/qmldomtool.cpp
index 99c81e0a95..9f6a194589 100644
--- a/tools/qmldom/qmldomtool.cpp
+++ b/tools/qmldom/qmldomtool.cpp
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
     // use host qml import path as a sane default if nothing else has been provided
     QStringList qmltypeDirs = parser.isSet(qmltypesDirsOption)
             ? parser.values(qmltypesDirsOption)
-            : QStringList { QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath) };
+            : QLibraryInfo::paths(QLibraryInfo::Qml2ImportsPath);
 
     if (!parser.isSet(qmltypesFilesOption))
         qmltypeDirs << ".";
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 631495b8db..56bc1a4d33 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -70,7 +70,7 @@ inline QString preferLiteral() { return QStringLiteral("prefer"); }
 void printUsage(const QString &appNameIn)
 {
     const std::string appName = appNameIn.toStdString();
-    const QString qmlPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
+    const QString qmlPath = QLibraryInfo::paths(QLibraryInfo::QmlImportsPath).value(0);
     std::cerr
         << "Usage: " << appName << " -rootPath path/to/app/qml/directory -importPath path/to/qt/qml/directory\n"
            "       " << appName << " -qmlFiles file1 file2 -importPath path/to/qt/qml/directory\n"
diff --git a/tools/qmllint/main.cpp b/tools/qmllint/main.cpp
index 1168d267f7..96c30cd2a9 100644
--- a/tools/qmllint/main.cpp
+++ b/tools/qmllint/main.cpp
@@ -263,7 +263,7 @@ All warnings can be set to four levels of severity:
         defaultImportPaths.append(QLatin1String(":/qt/qml"));
     };
 
-    defaultImportPaths.append(QLibraryInfo::path(QLibraryInfo::QmlImportsPath));
+    defaultImportPaths.append(QLibraryInfo::paths(QLibraryInfo::QmlImportsPath));
 
     QStringList qmlImportPaths =
             parser.isSet(qmlImportNoDefault) ? QStringList {} : defaultImportPaths;
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index a79b4aba21..877d8f00fb 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -518,11 +518,21 @@ int main(int argc, char ** argv)
 #if QT_CONFIG(translation)
     QLocale locale;
     QTranslator qtTranslator;
-    if (qtTranslator.load(locale, QLatin1String("qt"), QLatin1String("_"), QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
-        QCoreApplication::installTranslator(&qtTranslator);
     QTranslator translator;
-    if (translator.load(locale, QLatin1String("qmlscene"), QLatin1String("_"), QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
-        QCoreApplication::installTranslator(&translator);
+    const QStringList paths = QLibraryInfo::paths(QLibraryInfo::TranslationsPath);
+    for (const QString &path : paths) {
+        bool loaded = false;
+        if (qtTranslator.load(locale, QLatin1String("qt"), QLatin1String("_"), path)) {
+            QCoreApplication::installTranslator(&qtTranslator);
+            loaded = true;
+        }
+        if (translator.load(locale, QLatin1String("qmlscene"), QLatin1String("_"), path)) {
+            QCoreApplication::installTranslator(&translator);
+            loaded = true;
+        }
+        if (loaded)
+            break;
+    }
 
     QTranslator qmlTranslator;
     if (!options.translationFile.isEmpty()) {
diff --git a/tools/qmltc/main.cpp b/tools/qmltc/main.cpp
index 0fceb93cf0..563f9eddee 100644
--- a/tools/qmltc/main.cpp
+++ b/tools/qmltc/main.cpp
@@ -175,7 +175,7 @@ int main(int argc, char **argv)
         importPaths.append(parser.values(importPathOption));
 
     if (!parser.isSet(bareOption))
-        importPaths.append(QLibraryInfo::path(QLibraryInfo::QmlImportsPath));
+        importPaths.append(QLibraryInfo::paths(QLibraryInfo::QmlImportsPath));
 
     QStringList qmldirFiles = QQmlJSUtils::cleanPaths(parser.values(qmldirOption));