From c051ea15c75851132d08f22825d84d4ea3f49241 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Thu, 1 Mar 2012 19:02:20 +0100 Subject: Remove the usage of deprecated qdoc macros. QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: Iae34eb8f2233dd9dbec79e7ab3c324f3f505b4cc Reviewed-by: Jerome Pasion --- doc/src/examples/qml-examples.qdoc | 126 ++++++++++++++++++------------------ doc/src/examples/qml-extending.qdoc | 80 +++++++++++------------ 2 files changed, 103 insertions(+), 103 deletions(-) (limited to 'doc/src/examples') diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index 8b537cbe..57b97b19 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -34,9 +34,9 @@ \table \row - \o \image qml-coloranim-example.png + \li \image qml-coloranim-example.png \row - \o color-animation.qml + \li color-animation.qml \endtable */ @@ -49,9 +49,9 @@ \table \row - \o \image qml-propertyanim-example.png + \li \image qml-propertyanim-example.png \row - \o property-animation.qml + \li property-animation.qml \endtable */ @@ -100,16 +100,16 @@ \table \row - \o \image qml-states-example.png + \li \image qml-states-example.png \row - \o states.qml + \li states.qml \endtable \table \row - \o \image qml-transitions-example.png + \li \image qml-transitions-example.png \row - \o transitions.qml + \li transitions.qml \endtable */ @@ -123,9 +123,9 @@ \table \row - \o \image qml-borderimage-example.png + \li \image qml-borderimage-example.png \row - \o borderimage.qml + \li borderimage.qml \endtable */ @@ -138,9 +138,9 @@ \table \row - \o \image qml-borderimage-shadows-example.png + \li \image qml-borderimage-shadows-example.png \row - \o shadows.qml + \li shadows.qml \endtable */ @@ -167,16 +167,16 @@ Furthermore, here are additional pages that discuss each example in detail: \list - \o \l {declarative/cppextensions/referenceexamples/adding}{Adding Types} - \o \l {declarative/cppextensions/referenceexamples/properties}{Object and List Property Types} - \o \l {declarative/cppextensions/referenceexamples/coercion}{Inheritance and Coercion} - \o \l {declarative/cppextensions/referenceexamples/default}{Default Property} - \o \l {declarative/cppextensions/referenceexamples/grouped}{Grouped Properties} - \o \l {declarative/cppextensions/referenceexamples/attached}{Attached Properties} - \o \l {declarative/cppextensions/referenceexamples/signal}{Signal Support} - \o \l {declarative/cppextensions/referenceexamples/methods}{Methods Support} - \o \l {declarative/cppextensions/referenceexamples/valuesource}{Property Value Source} - \o \l {declarative/cppextensions/referenceexamples/binding}{Binding} + \li \l {declarative/cppextensions/referenceexamples/adding}{Adding Types} + \li \l {declarative/cppextensions/referenceexamples/properties}{Object and List Property Types} + \li \l {declarative/cppextensions/referenceexamples/coercion}{Inheritance and Coercion} + \li \l {declarative/cppextensions/referenceexamples/default}{Default Property} + \li \l {declarative/cppextensions/referenceexamples/grouped}{Grouped Properties} + \li \l {declarative/cppextensions/referenceexamples/attached}{Attached Properties} + \li \l {declarative/cppextensions/referenceexamples/signal}{Signal Support} + \li \l {declarative/cppextensions/referenceexamples/methods}{Methods Support} + \li \l {declarative/cppextensions/referenceexamples/valuesource}{Property Value Source} + \li \l {declarative/cppextensions/referenceexamples/binding}{Binding} \endlist \note These examples all print information to the console to demonstrate the concepts presented. @@ -230,9 +230,9 @@ layout components with QML: \list - \o \l{declarative/cppextensions/qgraphicslayouts/layoutitem}{LayoutItem} - \o \l{declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout}{QGraphicsGridLayout} - \o \l{declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout}{QGraphicsLinearLayout} + \li \l{declarative/cppextensions/qgraphicslayouts/layoutitem}{LayoutItem} + \li \l{declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout}{QGraphicsGridLayout} + \li \l{declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout}{QGraphicsLinearLayout} \endlist Also see \l {Integrating QML Code with Existing Qt UI Code} for information on using QML @@ -404,11 +404,11 @@ \page qml-listview-examples.html \list - \o \l {Models and Views: Dynamic List ListView Example} - \o \l {Models and Views: Expanding Delegate ListView Example} - \o \l {Models and Views: Highlight ListView Example} - \o \l {Models and Views: Highlight Ranges ListView Example} - \o \l {Models and Views: Sections ListView Example} + \li \l {Models and Views: Dynamic List ListView Example} + \li \l {Models and Views: Expanding Delegate ListView Example} + \li \l {Models and Views: Highlight ListView Example} + \li \l {Models and Views: Highlight Ranges ListView Example} + \li \l {Models and Views: Sections ListView Example} \endlist */ @@ -424,9 +424,9 @@ \table \row - \o \image qml-listview-dynamiclist-example.png + \li \image qml-listview-dynamiclist-example.png \row - \o dynamiclist.qml + \li dynamiclist.qml \endtable */ @@ -440,9 +440,9 @@ \table \row - \o \image qml-listview-expandingdelegates-example.png + \li \image qml-listview-expandingdelegates-example.png \row - \o expandingdelegates.qml + \li expandingdelegates.qml \endtable */ @@ -457,9 +457,9 @@ \table \row - \o \image qml-listview-highlight-example.png + \li \image qml-listview-highlight-example.png \row - \o highlight.qml + \li highlight.qml \endtable */ @@ -474,9 +474,9 @@ \table \row - \o \image qml-listview-highlightranges-example.png + \li \image qml-listview-highlightranges-example.png \row - \o highlightranges.qml + \li highlightranges.qml \endtable */ @@ -490,9 +490,9 @@ \table \row - \o \image qml-listview-sections-example.png + \li \image qml-listview-sections-example.png \row - \o sections.qml + \li sections.qml \endtable */ @@ -563,11 +563,11 @@ \brief These examples show how to use the WebView element. \list - \o \l {Models and Views: Alert WebView Example} - \o \l {Models and Views: Autosize WebView Example} - \o \l {Models and Views: GoogleMaps WebView Example} - \o \l {Models and Views: Inline HTML WebView Example} - \o \l {Models and Views: New Windows WebView Example} + \li \l {Models and Views: Alert WebView Example} + \li \l {Models and Views: Autosize WebView Example} + \li \l {Models and Views: GoogleMaps WebView Example} + \li \l {Models and Views: Inline HTML WebView Example} + \li \l {Models and Views: New Windows WebView Example} \endlist @@ -581,9 +581,9 @@ \table \row - \o \image qml-webview-alert-example.png + \li \image qml-webview-alert-example.png \row - \o alert.qml + \li alert.qml \endtable */ @@ -596,9 +596,9 @@ \table \row - \o \image qml-webview-autosize-example.png + \li \image qml-webview-autosize-example.png \row - \o autosize.qml + \li autosize.qml \endtable */ @@ -611,9 +611,9 @@ \table \row - \o \image qml-webview-googlemaps-example.png + \li \image qml-webview-googlemaps-example.png \row - \o googlemaps.qml + \li googlemaps.qml \endtable */ @@ -626,9 +626,9 @@ \table \row - \o \image qml-webview-inlinehtml-example.png + \li \image qml-webview-inlinehtml-example.png \row - \o inlinehtml.qml + \li inlinehtml.qml \endtable */ @@ -641,9 +641,9 @@ \table \row - \o \image qml-webview-newwindows-example.png + \li \image qml-webview-newwindows-example.png \row - \o newwindows.qml + \li newwindows.qml \endtable */ @@ -672,9 +672,9 @@ \table \row - \o \image qml-fonts-availableFonts-example.png + \li \image qml-fonts-availableFonts-example.png \row - \o availableFonts.qml + \li availableFonts.qml \endtable */ @@ -687,9 +687,9 @@ \table \row - \o \image qml-fonts-banner-example.png + \li \image qml-fonts-banner-example.png \row - \o banner.qml + \li banner.qml \endtable */ @@ -702,9 +702,9 @@ \table \row - \o \image qml-fonts-fonts-example.png + \li \image qml-fonts-fonts-example.png \row - \o fonts.qml + \li fonts.qml \endtable */ @@ -717,9 +717,9 @@ \table \row - \o \image qml-fonts-hello-example.png + \li \image qml-fonts-hello-example.png \row - \o hello.qml + \li hello.qml \endtable */ diff --git a/doc/src/examples/qml-extending.qdoc b/doc/src/examples/qml-extending.qdoc index b7e74dca..b479d5ab 100644 --- a/doc/src/examples/qml-extending.qdoc +++ b/doc/src/examples/qml-extending.qdoc @@ -67,7 +67,7 @@ loads and runs the QML snippet shown at the beginning of this page. This example builds on: \list -\o \l {Extending QML - Adding Types Example} +\li \l {Extending QML - Adding Types Example} \endlist The Object and List Property Types example shows how to add object and list @@ -115,8 +115,8 @@ loads and runs the QML snippet shown at the beginning of this page. This example builds on: \list -\o \l {Extending QML - Object and List Property Types Example} -\o \l {Extending QML - Adding Types Example} +\li \l {Extending QML - Object and List Property Types Example} +\li \l {Extending QML - Adding Types Example} \endlist The Inheritance and Coercion Example shows how to use base classes to assign @@ -178,9 +178,9 @@ loads and runs the QML snippet shown at the beginning of this page. This example builds on: \list -\o \l {Extending QML - Inheritance and Coercion Example} -\o \l {Extending QML - Object and List Property Types Example} -\o \l {Extending QML - Adding Types Example} +\li \l {Extending QML - Inheritance and Coercion Example} +\li \l {Extending QML - Object and List Property Types Example} +\li \l {Extending QML - Adding Types Example} \endlist The Default Property Example is a minor modification of the @@ -214,10 +214,10 @@ loads and runs the QML snippet shown at the beginning of this page. This example builds on: \list -\o \l {Extending QML - Default Property Example} -\o \l {Extending QML - Inheritance and Coercion Example} -\o \l {Extending QML - Object and List Property Types Example} -\o \l {Extending QML - Adding Types Example} +\li \l {Extending QML - Default Property Example} +\li \l {Extending QML - Inheritance and Coercion Example} +\li \l {Extending QML - Object and List Property Types Example} +\li \l {Extending QML - Adding Types Example} \endlist */ @@ -228,11 +228,11 @@ This example builds on: This example builds on: \list -\o \l {Extending QML - Grouped Properties Example} -\o \l {Extending QML - Default Property Example} -\o \l {Extending QML - Inheritance and Coercion Example} -\o \l {Extending QML - Object and List Property Types Example} -\o \l {Extending QML - Adding Types Example} +\li \l {Extending QML - Grouped Properties Example} +\li \l {Extending QML - Default Property Example} +\li \l {Extending QML - Inheritance and Coercion Example} +\li \l {Extending QML - Object and List Property Types Example} +\li \l {Extending QML - Adding Types Example} \endlist */ @@ -243,12 +243,12 @@ This example builds on: This example builds on: \list -\o \l {Extending QML - Attached Properties Example} -\o \l {Extending QML - Grouped Properties Example} -\o \l {Extending QML - Default Property Example} -\o \l {Extending QML - Inheritance and Coercion Example} -\o \l {Extending QML - Object and List Property Types Example} -\o \l {Extending QML - Adding Types Example} +\li \l {Extending QML - Attached Properties Example} +\li \l {Extending QML - Grouped Properties Example} +\li \l {Extending QML - Default Property Example} +\li \l {Extending QML - Inheritance and Coercion Example} +\li \l {Extending QML - Object and List Property Types Example} +\li \l {Extending QML - Adding Types Example} \endlist */ @@ -259,10 +259,10 @@ This example builds on: This example builds on: \list -\o \l {Extending QML - Default Property Example} -\o \l {Extending QML - Inheritance and Coercion Example} -\o \l {Extending QML - Object and List Property Types Example} -\o \l {Extending QML - Adding Types Example} +\li \l {Extending QML - Default Property Example} +\li \l {Extending QML - Inheritance and Coercion Example} +\li \l {Extending QML - Object and List Property Types Example} +\li \l {Extending QML - Adding Types Example} \endlist */ @@ -273,13 +273,13 @@ This example builds on: This example builds on: \list -\o \l {Extending QML - Signal Support Example} -\o \l {Extending QML - Attached Properties Example} -\o \l {Extending QML - Grouped Properties Example} -\o \l {Extending QML - Default Property Example} -\o \l {Extending QML - Inheritance and Coercion Example} -\o \l {Extending QML - Object and List Property Types Example} -\o \l {Extending QML - Adding Types Example} +\li \l {Extending QML - Signal Support Example} +\li \l {Extending QML - Attached Properties Example} +\li \l {Extending QML - Grouped Properties Example} +\li \l {Extending QML - Default Property Example} +\li \l {Extending QML - Inheritance and Coercion Example} +\li \l {Extending QML - Object and List Property Types Example} +\li \l {Extending QML - Adding Types Example} \endlist */ @@ -290,14 +290,14 @@ This example builds on: This example builds on: \list -\o \l {Extending QML - Property Value Source Example} -\o \l {Extending QML - Signal Support Example} -\o \l {Extending QML - Attached Properties Example} -\o \l {Extending QML - Grouped Properties Example} -\o \l {Extending QML - Default Property Example} -\o \l {Extending QML - Inheritance and Coercion Example} -\o \l {Extending QML - Object and List Property Types Example} -\o \l {Extending QML - Adding Types Example} +\li \l {Extending QML - Property Value Source Example} +\li \l {Extending QML - Signal Support Example} +\li \l {Extending QML - Attached Properties Example} +\li \l {Extending QML - Grouped Properties Example} +\li \l {Extending QML - Default Property Example} +\li \l {Extending QML - Inheritance and Coercion Example} +\li \l {Extending QML - Object and List Property Types Example} +\li \l {Extending QML - Adding Types Example} \endlist */ -- cgit v1.2.3