Avoid writing code markers in DocBook

They simply clutter the output, while the DocBook processor afterwards is supposed to take care of syntax highlighting.

The regression files for "tst_generatedOutput" were regenerated to take
the changes into account.

Change-Id: I4385a77782cb30cb4cdbd56343efcdc4e1636acb
Reviewed-by: Luca Di Sera <luca.disera@qt.io>

5 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml
index 7944e3fa1..65c189098 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qdoctests-qdocfileoutput-exhaustive.xml
@@ -23,7 +23,7 @@
 <db:para><db:emphasis role="bold">All your text belong to bold</db:emphasis> ...And this is an examble of only <db:emphasis role="bold">bold</db:emphasis> being, well, bold.</db:para>
 <db:programlisting language="cpp">    ...
 </db:programlisting>
-<db:programlisting language="js">&lt;@comment&gt;// If I knew JavaScript, this is where I would write it.&lt;/@comment&gt;
+<db:programlisting language="js">// If I knew JavaScript, this is where I would write it.
 </db:programlisting>
 <db:para>And if I knew qmltext, I guess this is where that would go. </db:para>
 <db:title>This a caption</db:title>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml
index df288e80f..2bc8e3fab 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-qdoc-test-doctest.xml
@@ -64,9 +64,9 @@
 <db:synopsisinfo db:role="threadsafeness">unspecified</db:synopsisinfo>
 </db:fieldsynopsis>
 <db:para>Name of the test.</db:para>
-<db:programlisting language="qml">&lt;@type&gt;DocTest&lt;/@type&gt; {
-    &lt;@name&gt;name&lt;/@name&gt;: &lt;@string&gt;&amp;quot;test&amp;quot;&lt;/@string&gt;
-    &lt;@comment&gt;// ...&lt;/@comment&gt;
+<db:programlisting language="qml">DocTest {
+    name: &amp;quot;test&amp;quot;
+    // ...
 }
 </db:programlisting>
 </db:section>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml
index 0232dbe27..1a581279b 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/docbook/qml-uicomponents-tabwidget.xml
@@ -29,13 +29,13 @@
 
     Rectangle {
         id: tab1
-        color: &lt;@string&gt;&amp;quot;red&amp;quot;&lt;/@string&gt;
-        &lt;@comment&gt;//... omitted&lt;/@comment&gt;
+        color: &amp;quot;red&amp;quot;
+        //... omitted
     }
     Rectangle {
         id: tab2
-        color: &lt;@string&gt;&amp;quot;blue&amp;quot;&lt;/@string&gt;
-        &lt;@comment&gt;//... omitted&lt;/@comment&gt;
+        color: &amp;quot;blue&amp;quot;
+        //... omitted
     }
 
 }
@@ -69,7 +69,7 @@
 </db:fieldsynopsis>
 <db:para>A sample <db:code>read-only</db:code> property. A contrived property to demonstrate QDoc's ability to detect read-only properties.</db:para>
 <db:para>The signature is:</db:para>
-<db:programlisting language="cpp">readonly property &lt;@type&gt;int&lt;/@type&gt; sampleReadOnlyProperty: &lt;@number&gt;0&lt;/@number&gt;
+<db:programlisting language="cpp">readonly property int sampleReadOnlyProperty: 0
 </db:programlisting>
 <db:para>Note that the property must be initialized to a value.</db:para>
 </db:section>
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 5806fc557..1628d25dd 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
@@ -21,8 +21,8 @@
 <db:title>Properties, Signals, Handlers, and Methods</db:title>
 <db:para>The types have their properties, signals, handlers, and methods defined in their respective QML files. QDoc associates the properties and methods to the types, therefore, you only need to place the documentation above the property, method, or signal.</db:para>
 <db:para>To document the type of a <db:emphasis>property alias</db:emphasis>, you must use the \qmlproperty command to specify the data type.</db:para>
-<db:programlisting language="cpp">\qmlproperty &lt;@type&gt;int&lt;/@type&gt; anAliasedProperty
-An aliased property of type &lt;@type&gt;int&lt;/@type&gt;&lt;@op&gt;.&lt;/@op&gt;
+<db:programlisting language="cpp">\qmlproperty int anAliasedProperty
+An aliased property of type int.
 </db:programlisting>
 <db:section xml:id="internal-documentation">
 <db:title>Internal Documentation</db:title>
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml b/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml
index 062d7cdf0..609b7cec9 100644
--- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml
+++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist-docbook/test-componentset-example.xml
@@ -21,8 +21,8 @@
 <db:title>Properties, Signals, Handlers, and Methods</db:title>
 <db:para>The types have their properties, signals, handlers, and methods defined in their respective QML files. QDoc associates the properties and methods to the types, therefore, you only need to place the documentation above the property, method, or signal.</db:para>
 <db:para>To document the type of a <db:emphasis>property alias</db:emphasis>, you must use the \qmlproperty command to specify the data type.</db:para>
-<db:programlisting language="cpp">\qmlproperty &lt;@type&gt;int&lt;/@type&gt; anAliasedProperty
-An aliased property of type &lt;@type&gt;int&lt;/@type&gt;&lt;@op&gt;.&lt;/@op&gt;
+<db:programlisting language="cpp">\qmlproperty int anAliasedProperty
+An aliased property of type int.
 </db:programlisting>
 <db:section xml:id="internal-documentation">
 <db:title>Internal Documentation</db:title>