diff options
Diffstat (limited to 'tools/qmlmin')
-rw-r--r-- | tools/qmlmin/main.cpp | 10 | ||||
-rw-r--r-- | tools/qmlmin/qmlmin.pro | 9 |
2 files changed, 6 insertions, 13 deletions
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() diff --git a/tools/qmlmin/qmlmin.pro b/tools/qmlmin/qmlmin.pro index f5248e1b69..32d9e3343b 100644 --- a/tools/qmlmin/qmlmin.pro +++ b/tools/qmlmin/qmlmin.pro @@ -2,13 +2,6 @@ option(host_build) QT = core qmldevtools-private SOURCES += main.cpp -QMAKE_TARGET_PRODUCT = qmlmin -QMAKE_TARGET_DESCRIPTION = QML/JS minifier - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML/JS Minifier load(qt_tool) |