From 0909c01b2f5d3a466fe6094a501a2893170e2616 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 11 May 2012 13:18:52 +0200 Subject: qdoc: Fixed a regression bug caused by fixing error messages The C++ code marker is the default code marker. The default code marker was being called for .qdoc files. But when the tree nodes were each assigned a location object based on the location in the source file where the node was built, the default code marker was no longer used. Instead, the plain code marker was used. This was wrong. qdoc now knows to use the C++ code marker for all .qdoc files. Change-Id: I15a58168db74cc5aa82a1fbccc5b7ece219ec297 Reviewed-by: Casper van Donderen --- src/tools/qdoc/cppcodeparser.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/tools/qdoc/cppcodeparser.cpp') diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp index b77d6682d16..cf89bc02871 100644 --- a/src/tools/qdoc/cppcodeparser.cpp +++ b/src/tools/qdoc/cppcodeparser.cpp @@ -2538,11 +2538,12 @@ void CppCodeParser::createExampleFileNodes(FakeNode *fake) exampleFiles += Config::getFilesHere(fullPath, "*.qrc *.pro *.qmlproject qmldir"); } - foreach (const QString &exampleFile, exampleFiles) - (void) new FakeNode(fake, - exampleFile.mid(sizeOfBoringPartOfName), - Node::File, - Node::NoPageType); + foreach (const QString &exampleFile, exampleFiles) { + FakeNode* fn = new FakeNode(fake, + exampleFile.mid(sizeOfBoringPartOfName), + Node::File, + Node::NoPageType); + } foreach (const QString &imageFile, imageFiles) { new FakeNode(fake, imageFile.mid(sizeOfBoringPartOfName), -- cgit v1.2.3