From 1b97b5e4d3757e5e5ca85032c133009dea9de945 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@theqtcompany.com>
Date: Tue, 8 Sep 2015 13:58:07 +0200
Subject: Fix data tag support for split header and source

If data functions where defined inside the source file when having
source and header split they were simply ignored.

Change-Id: I6d32d3c721f656797a78d3ea740c102d6b93ec88
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
---
 plugins/autotest/testcodeparser.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/autotest/testcodeparser.cpp b/plugins/autotest/testcodeparser.cpp
index b5451aef8e..975b92de92 100644
--- a/plugins/autotest/testcodeparser.cpp
+++ b/plugins/autotest/testcodeparser.cpp
@@ -480,8 +480,12 @@ void TestCodeParser::checkDocumentForTestCode(CPlusPlus::Document::Ptr document)
             visitor.accept(declaringDoc->globalNamespace());
             const QMap<QString, TestCodeLocationAndType> testFunctions = visitor.privateSlots();
 
-            const QMap<QString, TestCodeLocationList> dataTags =
+            QMap<QString, TestCodeLocationList> dataTags =
                     checkForDataTags(declaringDoc->fileName(), testFunctions);
+
+            if (declaringDoc->fileName() != document->fileName())
+                dataTags.unite(checkForDataTags(document->fileName(), testFunctions));
+
             TestTreeItem *item = constructTestTreeItem(declaringDoc->fileName(), QString(),
                                                        testCaseName, line, column, testFunctions,
                                                        dataTags);
-- 
cgit v1.2.1