QDoc tests: Extend example manifest test

Add componentset.qml file.
Add tag that can get stripped out by manifestwriter.

Change-Id: Ie64fe0cdd29089a6b809fa7a9704f5c81edd1bdd
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

7 files changed, 15 insertions, 1 deletions

diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-componentset-example.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-componentset-example.xml
index d65d81fe1..5806fc557 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-componentset-example.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/test-componentset-example.xml
@@ -43,5 +43,7 @@ An aliased property of type <@type>int</@type><@op>.</@op&g
 <db:para><db:link xlink:href="componentset/TabWidget.qml">componentset/TabWidget.qml</db:link></db:para></db:listitem>
 <db:listitem>
 <db:para><db:link xlink:href="componentset/componentset.pro">componentset/componentset.pro</db:link></db:para></db:listitem>
+<db:listitem>
+<db:para><db:link xlink:href="componentset/componentset.qml">componentset/componentset.qml</db:link></db:para></db:listitem>
 </db:itemizedlist>
 </db:article>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml b/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml
index b528755a8..a87a014fe 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/examples-manifest.xml
@@ -9,6 +9,7 @@
         <example name="QML Documentation Example" docUrl="qthelp://org.qt-project.test.001/test/test-componentset-example.html" projectPath="tutorials/componentset/componentset.pro" isTest="true">
             <description><![CDATA[Example for documenting QML types.]]></description>
             <tags>documentation,qml,sample,test</tags>
+            <fileToOpen mainFile="true">tutorials/componentset/componentset.qml</fileToOpen>
         </example>
     </examples>
 </instructionals>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml
index a5f3a2577..56e42e88e 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/html/test-componentset-example.webxml
@@ -55,6 +55,11 @@ An aliased property of type int.</code>
                             <link raw="componentset/componentset.pro" href="test-componentset-componentset-pro.html" type="page" page="componentset.pro Example File">componentset/componentset.pro</link>
                         </para>
                     </item>
+                    <item>
+                        <para>
+                            <link raw="componentset/componentset.qml" href="test-componentset-componentset-qml.html" type="page" page="componentset.qml Example File">componentset/componentset.qml</link>
+                        </para>
+                    </item>
                 </list>
             </description>
         </page>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html
index 976f07c1c..b3a2b3705 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html
+++ b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html
@@ -51,6 +51,7 @@ An aliased property of type <span class="type">int</span><span class="operator">
 <li><a href="test-componentset-switch-qml.html">componentset/Switch.qml</a></li>
 <li><a href="test-componentset-tabwidget-qml.html">componentset/TabWidget.qml</a></li>
 <li><a href="test-componentset-componentset-pro.html">componentset/componentset.pro</a></li>
+<li><a href="test-componentset-componentset-qml.html">componentset/componentset.qml</a></li>
 </ul>
 </div>
 <!-- @@@componentset -->
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp b/tests/auto/qdoc/generatedoutput/expected_output/test.qhp
index 8d701a0e7..f5bbe89b3 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/test.qhp
+++ b/tests/auto/qdoc/generatedoutput/expected_output/test.qhp
@@ -139,6 +139,7 @@
             <file>test-cmaketest-example.html</file>
             <file>test-cmaketest-main-cpp.html</file>
             <file>test-componentset-componentset-pro.html</file>
+            <file>test-componentset-componentset-qml.html</file>
             <file>test-componentset-example.html</file>
             <file>test-componentset-progressbar-qml.html</file>
             <file>test-componentset-switch-qml.html</file>
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.qml b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.qml
new file mode 100644
index 000000000..459c82afb
--- /dev/null
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/componentset.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.0
+
+Item {
+}
diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/examples.qdoc b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/examples.qdoc
index 9ca0db891..9c499713d 100644
--- a/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/examples.qdoc
+++ b/tests/auto/qdoc/generatedoutput/testdata/qml/componentset/examples.qdoc
@@ -32,7 +32,7 @@
 
     \testnoautolist
 
-    \meta tag {test,sample}
+    \meta tag {test,sample,(Qt)}
     \meta installpath tutorials
 
     This example demonstrates one of the ways to document QML types. It also