summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2012-12-13 12:11:48 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-13 12:16:24 +0100
commitd21763293022c89f366260c27b0b15ccf8d51b80 (patch)
tree14b24aa49f07ab0aeeb18c95c7ee38b0b6c52c51
parent50c50ef7b8481c01d49a295af63e8d4c8df5ff38 (diff)
downloadqtwebkit-examples-d21763293022c89f366260c27b0b15ccf8d51b80.tar.gz
Fix webkit example manifest generation.
Change-Id: Ia23f65e754932955f86276f5c2ff901de75ca4a0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
-rw-r--r--doc/qtwebkitexamples.qdocconf3
-rw-r--r--examples/webkitqml/flickrview/doc/src/flickrview.qdoc2
-rw-r--r--examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc2
-rw-r--r--examples/webkitwidgets/browser/doc/src/browser.qdoc2
-rw-r--r--examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc2
-rw-r--r--examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc2
-rw-r--r--examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc2
-rw-r--r--examples/webkitwidgets/framecapture/doc/src/webkit-framecapture.qdoc2
-rw-r--r--examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc2
-rw-r--r--examples/webkitwidgets/previewer/doc/src/previewer.qdoc2
-rw-r--r--examples/webkitwidgets/scroller/wheel/doc/src/wheel.qdoc2
-rw-r--r--examples/webkitwidgets/simpleselector/doc/src/simpleselector.qdoc2
-rw-r--r--examples/webkitwidgets/xmlpatterns/doc/src/qobjectxmlmodel.qdoc2
13 files changed, 13 insertions, 14 deletions
diff --git a/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf
index b88a143..162d793 100644
--- a/doc/qtwebkitexamples.qdocconf
+++ b/doc/qtwebkitexamples.qdocconf
@@ -35,8 +35,7 @@ outputdir = $QT_INSTALL_DOCS/qtwebkitexamples
depends += qtcore qtwidgets qtquick qtgui qtscript qtdoc qtxml qtwebkitwidgets qtwebkit
-exampledirs = ../examples/webkitwidgets \
- ../examples/webkitqml
+exampledirs = ../examples
sourcedirs = src
diff --git a/examples/webkitqml/flickrview/doc/src/flickrview.qdoc b/examples/webkitqml/flickrview/doc/src/flickrview.qdoc
index 11d2bc0..a5a44be 100644
--- a/examples/webkitqml/flickrview/doc/src/flickrview.qdoc
+++ b/examples/webkitqml/flickrview/doc/src/flickrview.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example flickrview
+ \example webkitqml/flickrview
\title Flickr View Example
\brief Demonstrates how to embed a web view in a Qt Quick application
\ingroup webkit-qmlexamples
diff --git a/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc b/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc
index 0f147a9..50a05b9 100644
--- a/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc
+++ b/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example youtubeview
+ \example webkitqml/youtubeview
\title YouTube View Example
\brief Demonstrates how to embed a web view in a Qt Quick application
\ingroup webkit-qmlexamples
diff --git a/examples/webkitwidgets/browser/doc/src/browser.qdoc b/examples/webkitwidgets/browser/doc/src/browser.qdoc
index bdb004c..fdd25ed 100644
--- a/examples/webkitwidgets/browser/doc/src/browser.qdoc
+++ b/examples/webkitwidgets/browser/doc/src/browser.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example browser
+ \example webkitwidgets/browser
\title Tab Browser
\brief Demonstrates a complete web browsing experience
\ingroup webkit-widgetexamples
diff --git a/examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc b/examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc
index 86b1616..b28f115 100644
--- a/examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc
+++ b/examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example domtraversal
+ \example webkitwidgets/domtraversal
\title DOM Traversal Example
\brief Demonstrates how to traverse the DOM tree
\ingroup webkit-widgetexamples
diff --git a/examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc b/examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc
index 0c6f417..74e76f1 100644
--- a/examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc
+++ b/examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example fancybrowser
+ \example webkitwidgets/fancybrowser
\title Fancy Browser Example
\brief Demonstrates how to use browse web and manipulate content
\ingroup webkit-widgetexamples
diff --git a/examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc b/examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc
index b8d2755..42bbe00 100644
--- a/examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc
+++ b/examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example formextractor
+ \example webkitwidgets/formextractor
\title Form Extractor Example
\brief Demonstrates how to read form data using JavaScript
\ingroup webkit-widgetexamples
diff --git a/examples/webkitwidgets/framecapture/doc/src/webkit-framecapture.qdoc b/examples/webkitwidgets/framecapture/doc/src/webkit-framecapture.qdoc
index b616011..dbd93a6 100644
--- a/examples/webkitwidgets/framecapture/doc/src/webkit-framecapture.qdoc
+++ b/examples/webkitwidgets/framecapture/doc/src/webkit-framecapture.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example webkit/framecapture
+ \example webkitwidgets/framecapture
\title WebKit Frame Capture Example
\brief Demonstrates how to capture frame in the web page
\ingroup webkit-widgetexamples
diff --git a/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc b/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc
index 44ce91c..c56ccdc 100644
--- a/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc
+++ b/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example webkit/imageanalyzer
+ \example webkitwidgets/imageanalyzer
\title The Webkit Bridge Tutorial - Hybrid Client Application
\brief Demonstrates how to integrate web functionality with other core
functionality.
diff --git a/examples/webkitwidgets/previewer/doc/src/previewer.qdoc b/examples/webkitwidgets/previewer/doc/src/previewer.qdoc
index e45dc17..3dcd75a 100644
--- a/examples/webkitwidgets/previewer/doc/src/previewer.qdoc
+++ b/examples/webkitwidgets/previewer/doc/src/previewer.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example previewer
+ \example webkitwidgets/previewer
\title Previewer Example
\brief Demonstrates how to preview HTML data
\ingroup webkit-widgetexamples
diff --git a/examples/webkitwidgets/scroller/wheel/doc/src/wheel.qdoc b/examples/webkitwidgets/scroller/wheel/doc/src/wheel.qdoc
index 779f3ca..fb7447c 100644
--- a/examples/webkitwidgets/scroller/wheel/doc/src/wheel.qdoc
+++ b/examples/webkitwidgets/scroller/wheel/doc/src/wheel.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example scroller/wheel
+ \example webkitwidgets/scroller/wheel
\title Wheel Scroller Example
\brief Demonstrates how scrolling is handled in Qt.
\ingroup webkit-widgetexamples
diff --git a/examples/webkitwidgets/simpleselector/doc/src/simpleselector.qdoc b/examples/webkitwidgets/simpleselector/doc/src/simpleselector.qdoc
index f42824a..0a86f55 100644
--- a/examples/webkitwidgets/simpleselector/doc/src/simpleselector.qdoc
+++ b/examples/webkitwidgets/simpleselector/doc/src/simpleselector.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example webkit/simpleselector
+ \example webkitwidgets/simpleselector
\title Simple Selector Example
\brief Demonstrates how to identify HTML elements in a web page
\ingroup webkit-widgetexamples
diff --git a/examples/webkitwidgets/xmlpatterns/doc/src/qobjectxmlmodel.qdoc b/examples/webkitwidgets/xmlpatterns/doc/src/qobjectxmlmodel.qdoc
index f386df3..99bfbea 100644
--- a/examples/webkitwidgets/xmlpatterns/doc/src/qobjectxmlmodel.qdoc
+++ b/examples/webkitwidgets/xmlpatterns/doc/src/qobjectxmlmodel.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \example xmlpatterns/qobjectxmlmodel
+ \example webkitwidgets/xmlpatterns
\title QObject XML Model Example
\brief Demonstrates how to present XML-like data structure in the web view
\ingroup webkit-widgetexamples