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

Change-Id: I92b13a9c1727644d63e125c1e6f1fdac72720ad7

3 files changed, 8 insertions, 3 deletions

diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 10d9829520..977c5b6ff1 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -276,7 +276,9 @@ int main(int argc, char **argv)
     parser.process(app);
 
     const QStringList sources = parser.positionalArguments();
-    if (sources.count() > 1) {
+    if (sources.isEmpty()){
+        parser.showHelp();
+    } else if (sources.count() > 1) {
         fprintf(stderr, "%s\n", qPrintable(QStringLiteral("Too many input files specified: '") + sources.join(QStringLiteral("' '")) + QLatin1Char('\'')));
         return EXIT_FAILURE;
     }
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 897902b26f..26a83395c8 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -539,7 +539,7 @@ int main(int argc, char *argv[])
             if (arg.startsWith(QLatin1Char('-')) && arg != QLatin1String("-"))
                 break;
             ++i;
-            if (!QFile::exists(arg)) {
+            if (arg != QLatin1String("-") && !QFile::exists(arg)) {
                 std::cerr << qPrintable(appName) << ": No such file or directory: \""
                     << qPrintable(arg) << "\"\n";
                 return 1;
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 774be45aec..acd892bedb 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -839,7 +839,8 @@ static bool getDependencies(const QQmlEngine &engine, const QString &pluginImpor
     QStringList commandArgs = QStringList()
             << QLatin1String("-qmlFiles")
             << QLatin1String("-");
-    const auto importPathList = engine.importPathList();
+    QStringList importPathList = engine.importPathList();
+    importPathList.removeOne(QStringLiteral("qrc:/qt-project.org/imports"));
     for (const QString &path : importPathList)
         commandArgs << QLatin1String("-importPath") << path;
 
@@ -866,6 +867,8 @@ static bool getDependencies(const QQmlEngine &engine, const QString &pluginImpor
     if (!readDependenciesData(QLatin1String("<outputOfQmlimportscanner>"), depencenciesData,
                              dependencies, QStringList(pluginImportUri), forceQtQuickDependency)) {
         std::cerr << "failed to proecess output of qmlimportscanner" << std::endl;
+        if (importScanner.exitCode() != 0)
+            std::cerr << importScanner.readAllStandardError().toStdString();
         return false;
     }