summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-03-18 10:36:20 +0100
committerUlf Hermann <ulf.hermann@qt.io>2019-03-27 09:23:56 +0000
commit50335cb26bb88930f5e2a204642439cc9a4d2282 (patch)
treee7c03d9e3ba5db1f660e8bba17a18b7cbb55cf08
parent9beac9838510e94338377fcd1cfc68b371f32a86 (diff)
Mark throwRecursionDepthError() as final
Task-number: QTBUG-74510 Change-Id: I4c6e20a55d76e308808f091fb224ee5c612bc239 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/linguist/lupdate/qdeclarative.cpp2
-rw-r--r--src/qdoc/qmlmarkupvisitor.h2
-rw-r--r--src/qdoc/qmlvisitor.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/linguist/lupdate/qdeclarative.cpp b/src/linguist/lupdate/qdeclarative.cpp
index 0938b86e8..69164add2 100644
--- a/src/linguist/lupdate/qdeclarative.cpp
+++ b/src/linguist/lupdate/qdeclarative.cpp
@@ -221,7 +221,7 @@ private:
return std::cerr << qPrintable(m_fileName) << ':' << line << ": ";
}
- void throwRecursionDepthError()
+ void throwRecursionDepthError() final
{
std::cerr << qPrintable(m_fileName) << ": "
<< qPrintable(LU::tr("Maximum statement or expression depth exceeded"));
diff --git a/src/qdoc/qmlmarkupvisitor.h b/src/qdoc/qmlmarkupvisitor.h
index d369454ff..c752f7264 100644
--- a/src/qdoc/qmlmarkupvisitor.h
+++ b/src/qdoc/qmlmarkupvisitor.h
@@ -153,7 +153,7 @@ private:
void addVerbatim(QQmlJS::AST::SourceLocation first,
QQmlJS::AST::SourceLocation last = QQmlJS::AST::SourceLocation());
QString sourceText(QQmlJS::AST::SourceLocation &location);
- void throwRecursionDepthError();
+ void throwRecursionDepthError() final;
QQmlJS::Engine *engine;
QVector<ExtraType> extraTypes;
diff --git a/src/qdoc/qmlvisitor.h b/src/qdoc/qmlvisitor.h
index 6e73171dc..4d32a6bd5 100644
--- a/src/qdoc/qmlvisitor.h
+++ b/src/qdoc/qmlvisitor.h
@@ -92,7 +92,7 @@ public:
bool visit(QQmlJS::AST::UiQualifiedId *) override;
void endVisit(QQmlJS::AST::UiQualifiedId *) override;
- void throwRecursionDepthError();
+ void throwRecursionDepthError() final;
bool hasError() const;
private: