4 files changed, 10 insertions, 12 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 8af9a1de41..53dd35da07 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -130,7 +130,7 @@ class LoaderApplication : public QGuiApplication
 public:
     LoaderApplication(int& argc, char **argv) : QGuiApplication(argc, argv) {}
 
-    bool event(QEvent *ev)
+    bool event(QEvent *ev) override
     {
         if (ev->type() == QEvent::FileOpen) {
             if (exitTimerId >= 0) {
@@ -144,7 +144,7 @@ public:
         return true;
     }
 
-    void timerEvent(QTimerEvent *) {
+    void timerEvent(QTimerEvent *) override {
         noFilesGiven();
     }
 };
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index bac7694e17..26a83395c8 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -291,7 +291,7 @@ struct ImportCollector : public QQmlJS::Directives
 {
     QVariantList imports;
 
-    virtual void importFile(const QString &jsfile, const QString &module, int line, int column)
+    void importFile(const QString &jsfile, const QString &module, int line, int column) override
     {
         QVariantMap entry;
         entry[typeLiteral()] = QStringLiteral("javascript");
@@ -303,7 +303,7 @@ struct ImportCollector : public QQmlJS::Directives
         Q_UNUSED(column);
     }
 
-    virtual void importModule(const QString &uri, const QString &version, const QString &module, int line, int column)
+    void importModule(const QString &uri, const QString &version, const QString &module, int line, int column) override
     {
         QVariantMap entry;
         if (uri.contains(QLatin1Char('/'))) {
diff --git a/tools/qmljs/qmljs.cpp b/tools/qmljs/qmljs.cpp
index 14a20731c0..182547490d 100644
--- a/tools/qmljs/qmljs.cpp
+++ b/tools/qmljs/qmljs.cpp
@@ -69,9 +69,7 @@ static void showException(QV4::ExecutionContext *ctx, const QV4::Value &exceptio
     if (!e) {
         std::cerr << "Uncaught exception: " << qPrintable(ex->toQString()) << std::endl;
     } else {
-        QV4::ScopedString m(scope, scope.engine->newString(QStringLiteral("message")));
-        QV4::ScopedValue message(scope, e->get(m));
-        std::cerr << "Uncaught exception: " << qPrintable(message->toQStringNoThrow()) << std::endl;
+        std::cerr << "Uncaught exception: " << qPrintable(e->toQStringNoThrow()) << std::endl;
     }
 
     for (const QV4::StackFrame &frame : trace) {
diff --git a/tools/qmlmin/main.cpp b/tools/qmlmin/main.cpp
index 6877ca7442..5641e6348e 100644
--- a/tools/qmlmin/main.cpp
+++ b/tools/qmlmin/main.cpp
@@ -83,12 +83,12 @@ public:
     //
     // Handle the .pragma/.import directives
     //
-    virtual void pragmaLibrary()
+    void pragmaLibrary() override
     {
         _directives += QLatin1String(".pragma library\n");
     }
 
-    virtual void importFile(const QString &jsfile, const QString &module, int line, int column)
+    void importFile(const QString &jsfile, const QString &module, int line, int column) override
     {
         _directives += QLatin1String(".import");
         _directives += QLatin1Char('"');
@@ -101,7 +101,7 @@ public:
         Q_UNUSED(column);
     }
 
-    virtual void importModule(const QString &uri, const QString &version, const QString &module, int line, int column)
+    void importModule(const QString &uri, const QString &version, const QString &module, int line, int column) override
     {
         _directives += QLatin1String(".import ");
         _directives += uri;
@@ -201,7 +201,7 @@ public:
 
 protected:
     void append(const QString &s);
-    bool parse(int startToken);
+    bool parse(int startToken) override;
     void escape(const QChar &ch, QString *out);
 };
 
@@ -409,7 +409,7 @@ public:
     QStringList tokenStream() const;
 
 protected:
-    virtual bool parse(int startToken);
+    bool parse(int startToken) override;
 };
 
 Tokenize::Tokenize()