From 05e3cdd8ab57686407d472722ab2e724c01de6b7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 8 Nov 2016 13:09:54 +0100
Subject: Set Qt version on tools

Change-Id: I21d77b2eba7107528fc00db0cf5d87f8347b63be
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
---
 tools/qmlimportscanner/main.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools/qmlimportscanner')

diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index f7f5a5e4e4..f069c1883f 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -483,6 +483,7 @@ QVariantList findQmlImportsRecursively(const QStringList &qmlDirs, const QString
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
+    QCoreApplication::setApplicationVersion(QLatin1String(QT_VERSION_STR));
     QStringList args = app.arguments();
     const QString appName = QFileInfo(app.applicationFilePath()).baseName();
     if (args.size() < 2) {
-- 
cgit v1.2.3


From a23bcdf91971510b79c541fdff4a9467ead08751 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Tue, 1 Nov 2016 15:19:59 +0100
Subject: qmlimportscanner: When passed an invalid file/directory it should
 cause an error

Task-number: QTBUG-56617
Change-Id: I82eb9c07fd6350b2a63f80e62af4c0adf52656c7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 tools/qmlimportscanner/main.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tools/qmlimportscanner')

diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index f069c1883f..0f8eca34e1 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -528,7 +528,12 @@ int main(int argc, char *argv[])
             if (arg.startsWith(QLatin1Char('-')) && arg != QLatin1String("-"))
                 break;
             ++i;
-            *argReceiver += arg;
+            if (!QFile::exists(arg)) {
+                std::cerr << "No such file or directory: \"" << qPrintable(arg) << "\"\n";
+                return 1;
+            } else {
+                *argReceiver += arg;
+            }
         }
     }
 
-- 
cgit v1.2.3