diff options
author | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-02-28 17:51:32 +0100 |
---|---|---|
committer | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-03-03 15:31:10 +0000 |
commit | b09a48599e7e5db5447189136353b79aca3898cf (patch) | |
tree | 5f6f3b1d4da3ed746caa612992d94ed21978dd75 /src/plugins/qmlprofiler | |
parent | a24dead5f63d7eb0b209539daebf5b2ce558b1c0 (diff) |
Update qmljs parser to Qt 5.15 parser
* parser side support for annotations, inline components, new UiVersion
and all the things included in QT 5.15 parser
* SourceLocation moved from QmlJS:AST to QmlJS
* Visitors now need to handle throwRecursionDepthError
* BaseVisitor for visitors that want to override all visit
Task-number: QTCREATORBUG-23591
Change-Id: I682a30d0b08b6c929739fd0e339ef6fbde3eb630
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins/qmlprofiler')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp index cc97f7eb6a..3be8aff25b 100644 --- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp @@ -38,6 +38,8 @@ #include <utils/qtcassert.h> +#include <QDebug> + namespace QmlProfiler { namespace Internal { @@ -78,12 +80,16 @@ protected: return true; } + void throwRecursionDepthError() override + { + qWarning("Warning: Hit mximum recursion depth while visiting AST in PropertyVisitor"); + } private: QmlJS::AST::Node *m_lastValidNode = nullptr; quint32 m_line = 0; quint32 m_column = 0; - bool containsLocation(QmlJS::AST::SourceLocation start, QmlJS::AST::SourceLocation end) + bool containsLocation(QmlJS::SourceLocation start, QmlJS::SourceLocation end) { return (m_line > start.startLine || (m_line == start.startLine && m_column >= start.startColumn)) |