Skip to content

Commit 491a5b6

Browse files
author
Casper van Donderen
committed
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
2 parents 7163a8c + c4a34f8 commit 491a5b6

29 files changed

+5
-1701
lines changed

doc/src/examples/qml-examples.qdoc

+5-5
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@
566566
\example declarative/modelviews/webview/alerts
567567
\depends helper/qmlapplicationviewer
568568

569-
\brief These examples show how to use the WebView element.
569+
\brief This example shows how to create an alert in the WebView element.
570570

571571
\table
572572
\row
@@ -581,7 +581,7 @@
581581
\example declarative/modelviews/webview/autosize
582582
\depends helper/qmlapplicationviewer
583583

584-
\brief These examples show how to use the WebView element.
584+
\brief This example show how to use autosizing in the WebView element.
585585

586586
\table
587587
\row
@@ -596,7 +596,7 @@
596596
\example declarative/modelviews/webview/googlemaps
597597
\depends helper/qmlapplicationviewer
598598

599-
\brief These examples show how to use the WebView element.
599+
\brief This example shows how to use a web service API and the WebView element.
600600

601601
\table
602602
\row
@@ -611,7 +611,7 @@
611611
\example declarative/modelviews/webview/inlinehtml
612612
\depends helper/qmlapplicationviewer
613613

614-
\brief These examples show how to use the WebView element.
614+
\brief This example shows how to use inline HTML with the WebView element.
615615

616616
\table
617617
\row
@@ -626,7 +626,7 @@
626626
\example declarative/modelviews/webview/newwindows
627627
\depends helper/qmlapplicationviewer
628628

629-
\brief These examples show how to use the WebView element.
629+
\brief These examples show how to create new windows in the WebView element.
630630

631631
\table
632632
\row

examples/declarative/modelviews/webview/alerts/qml/alerts/autosize.qml

-106
This file was deleted.

examples/declarative/modelviews/webview/alerts/qml/alerts/googlemaps.qml

-83
This file was deleted.

examples/declarative/modelviews/webview/alerts/qml/alerts/inlinehtml.qml

-55
This file was deleted.

examples/declarative/modelviews/webview/alerts/qml/alerts/newwindows.html

-3
This file was deleted.

examples/declarative/modelviews/webview/alerts/qml/alerts/newwindows.qml

-71
This file was deleted.

examples/declarative/modelviews/webview/autosize/qml/autosize/alerts.html

-5
This file was deleted.

0 commit comments

Comments
 (0)