summaryrefslogtreecommitdiff
path: root/Source/WebKit
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-06-17 13:36:15 +0200
committerSergio Ahumada <sahumada@blackberry.com>2014-06-17 13:36:15 +0200
commitfa612433ef0f978a8faf30dd322db855783831fd (patch)
treef83afc258edf2546a9d4b6cc73fe88d032b89f80 /Source/WebKit
parentba4102c575d338cdccba9937a116701c26509abb (diff)
parentdb1ec4efadf930cd8088286605128ae1d01d23e8 (diff)
downloadqtwebkit-5.3.1.tar.gz
Merge remote-tracking branch 'origin/stable' into 5.3v5.3.15.3.1
Change-Id: I182d18383f82025fa7b9cfe7f136cf590c01fb14
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/qt/docs/qtwebkit.qdoc1
-rw-r--r--Source/WebKit/qt/docs/webview.pngbin0 -> 94324 bytes
2 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebKit/qt/docs/qtwebkit.qdoc b/Source/WebKit/qt/docs/qtwebkit.qdoc
index e36cdeb62..f8f22fbd9 100644
--- a/Source/WebKit/qt/docs/qtwebkit.qdoc
+++ b/Source/WebKit/qt/docs/qtwebkit.qdoc
@@ -20,6 +20,7 @@
/*!
\qmlmodule QtWebKit 3.0
\title Qt WebKit QML Types
+ \ingroup qmlmodules
\brief Provides QML types for rendering web content within a QML application
The QML types can be imported into your applciation using the following
diff --git a/Source/WebKit/qt/docs/webview.png b/Source/WebKit/qt/docs/webview.png
new file mode 100644
index 000000000..bde3eb457
--- /dev/null
+++ b/Source/WebKit/qt/docs/webview.png
Binary files differ