From e9fe369321939a6c1cb0ba822272875481dc038e Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Tue, 22 Oct 2013 12:02:36 +0200 Subject: qdoc: Corrected error in QDocDatabase::findQmlType() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was still using the QML module version number as part of the search key. e.g. it tried to find the type node for QtQuick.Controls::Button using QtQuick.Controls2.Button, but now it searches without the 2. Task-number: QTBUG-34173 Change-Id: Ibc8b6d9ef4ceebb20c1be00ec3bc9190c51bcdf3 Reviewed-by: Topi Reiniö Reviewed-by: Jerome Pasion Reviewed-by: Nico Vertriest --- src/tools/qdoc/qmlvisitor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools/qdoc/qmlvisitor.h') diff --git a/src/tools/qdoc/qmlvisitor.h b/src/tools/qdoc/qmlvisitor.h index cdb7ae7391..feeeb13497 100644 --- a/src/tools/qdoc/qmlvisitor.h +++ b/src/tools/qdoc/qmlvisitor.h @@ -75,8 +75,8 @@ public: const QSet &topics); virtual ~QmlDocVisitor(); - bool visit(QQmlJS::AST::UiImportList *imports); - void endVisit(QQmlJS::AST::UiImportList *definition); + bool visit(QQmlJS::AST::UiImport *import); + void endVisit(QQmlJS::AST::UiImport *definition); bool visit(QQmlJS::AST::UiObjectDefinition *definition); void endVisit(QQmlJS::AST::UiObjectDefinition *definition); -- cgit v1.2.3