diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-06-26 09:06:10 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-07-03 18:40:41 +0000 |
| commit | 831dba9fc1839e192015ba5a6b6e43f858601d97 (patch) | |
| tree | 4e8e668fe124b224ef61ba5a4eff22d25eb465ba | |
| parent | 310ac6b0584875303ec5eab603b60320277ff598 (diff) | |
| download | qttools-831dba9fc1839e192015ba5a6b6e43f858601d97.tar.gz | |
qmlvisitor: deal with PatternElement::bindingIdentifer as QStringRef
This also reverts commit 38e5f27de587e6c9cc3b2844af792289afcd2d07 and
re-enables the build of the visitor.
Change-Id: I4cb0a51d5019797d45370e959dd0fca5a3d23a74
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/qdoc/qdoc.pro | 1 | ||||
| -rw-r--r-- | src/qdoc/qmlvisitor.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/qdoc/qdoc.pro b/src/qdoc/qdoc.pro index c88074a66..cdfda190f 100644 --- a/src/qdoc/qdoc.pro +++ b/src/qdoc/qdoc.pro @@ -10,7 +10,6 @@ qtHaveModule(qmldevtools-private) { } else { DEFINES += QT_NO_DECLARATIVE } -DEFINES += QT_NO_DECLARATIVE LIBS += $$CLANG_LIBS !contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qmlvisitor.cpp index 17391ca20..d54378331 100644 --- a/src/qdoc/qmlvisitor.cpp +++ b/src/qdoc/qmlvisitor.cpp @@ -781,7 +781,7 @@ bool QmlDocVisitor::visit(QQmlJS::AST::FunctionDeclaration* fd) if (formals) { QQmlJS::AST::FormalParameterList* fpl = formals; do { - parameters.append(Parameter(QString(), QString(), fpl->element->bindingIdentifier)); + parameters.append(Parameter(QString(), QString(), fpl->element->bindingIdentifier.toString())); fpl = fpl->next; } while (fpl && fpl != formals); qmlMethod->setParameters(parameters); |