diff options
author | Sergio Martins <sergio.martins@kdab.com> | 2015-05-06 21:04:07 +0100 |
---|---|---|
committer | Sérgio Martins <sergio.martins@kdab.com> | 2015-05-07 09:58:16 +0000 |
commit | e289ead3cd83c4abd74fc4a4ed842c7745a23096 (patch) | |
tree | cc912d12dd5c8da9651a2256362e0432a0fe9216 | |
parent | a4d77d3cb541cdc368a8ff7ce5bd87599195048e (diff) | |
download | qttools-e289ead3cd83c4abd74fc4a4ed842c7745a23096.tar.gz |
Fix misoverloaded virtual due to recent change in qtdeclarative
qtdeclarative/9d7b27f5bf44 changed the method's signature.
Added Q_DECL_OVERRIDE so it doesn't happen again.
Change-Id: I98cbd521d8b115c12f00b35a53fc1b773e339160
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r-- | src/linguist/lupdate/qdeclarative.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/linguist/lupdate/qdeclarative.cpp b/src/linguist/lupdate/qdeclarative.cpp index 842aa0a1b..42fe0a997 100644 --- a/src/linguist/lupdate/qdeclarative.cpp +++ b/src/linguist/lupdate/qdeclarative.cpp @@ -424,9 +424,9 @@ public: bool operator()() const { return directives != 0; } int end() const { return lastOffset; } - virtual void pragmaLibrary() { consumeDirective(); } - virtual void importFile(const QString &, const QString &) { consumeDirective(); } - virtual void importModule(const QString &, const QString &, const QString &) { consumeDirective(); } + void pragmaLibrary() Q_DECL_OVERRIDE { consumeDirective(); } + void importFile(const QString &, const QString &, int, int) Q_DECL_OVERRIDE { consumeDirective(); } + void importModule(const QString &, const QString &, const QString &, int, int) Q_DECL_OVERRIDE { consumeDirective(); } private: void consumeDirective() |