diff options
Diffstat (limited to 'tools/qmlimportscanner')
-rw-r--r-- | tools/qmlimportscanner/main.cpp | 4 | ||||
-rw-r--r-- | tools/qmlimportscanner/qmlimportscanner.pro | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp index 37d244c5e5..d596613553 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/qmlimportscanner/qmlimportscanner.pro b/tools/qmlimportscanner/qmlimportscanner.pro index 363424f948..0b3a03abf3 100644 --- a/tools/qmlimportscanner/qmlimportscanner.pro +++ b/tools/qmlimportscanner/qmlimportscanner.pro @@ -5,13 +5,6 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII SOURCES += main.cpp -QMAKE_TARGET_PRODUCT = qmlimportscanner -QMAKE_TARGET_DESCRIPTION = Tool to scan projects for QML imports - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Import Scanner load(qt_tool) |