diff options
| -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); |