<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42814] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/42814">42814</a></dd>
<dt>Author</dt> <dd>hausmann@webkit.org</dd>
<dt>Date</dt> <dd>2009-04-24 03:30:07 -0700 (Fri, 24 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-04-24  Simon Hausmann  &lt;simon.hausmann@nokia.com&gt;

        Reviewed by Ariya Hidayat.

        Added support for generating API docs in the Qt build using &quot;make docs&quot;

        Added code snippets and overview from the Qt sources references in the API docs.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkWebKitqtApiqwebpagecpp">trunk/WebKit/qt/Api/qwebpage.cpp</a></li>
<li><a href="#trunkWebKitqtApiqwebviewcpp">trunk/WebKit/qt/Api/qwebview.cpp</a></li>
<li><a href="#trunkWebKitqtChangeLog">trunk/WebKit/qt/ChangeLog</a></li>
<li><a href="#trunkWebKitpro">trunk/WebKit.pro</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/WebKit/qt/docs/</li>
<li><a href="#trunkWebKitqtdocsdocspri">trunk/WebKit/qt/docs/docs.pri</a></li>
<li><a href="#trunkWebKitqtdocsqtwebkitqdoc">trunk/WebKit/qt/docs/qtwebkit.qdoc</a></li>
<li><a href="#trunkWebKitqtdocsqtwebkitqdocconf">trunk/WebKit/qt/docs/qtwebkit.qdocconf</a></li>
<li>trunk/WebKit/qt/docs/webkitsnippets/</li>
<li><a href="#trunkWebKitqtdocswebkitsnippetsqtwebkit_build_snippetqdoc">trunk/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc</a></li>
<li><a href="#trunkWebKitqtdocswebkitsnippetsqtwebkit_qwebview_snippetcpp">trunk/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp</a></li>
<li>trunk/WebKit/qt/docs/webkitsnippets/simple/</li>
<li><a href="#trunkWebKitqtdocswebkitsnippetssimplemaincpp">trunk/WebKit/qt/docs/webkitsnippets/simple/main.cpp</a></li>
<li><a href="#trunkWebKitqtdocswebkitsnippetssimplesimplepro">trunk/WebKit/qt/docs/webkitsnippets/simple/simple.pro</a></li>
<li>trunk/WebKit/qt/docs/webkitsnippets/webpage/</li>
<li><a href="#trunkWebKitqtdocswebkitsnippetswebpagemaincpp">trunk/WebKit/qt/docs/webkitsnippets/webpage/main.cpp</a></li>
<li><a href="#trunkWebKitqtdocswebkitsnippetswebpagewebpagepro">trunk/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (42813 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2009-04-24 06:38:48 UTC (rev 42813)
+++ trunk/ChangeLog        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2009-04-24  Simon Hausmann  &lt;simon.hausmann@nokia.com&gt;
+
+        Reviewed by Ariya Hidayat.
+
+        Added support for generating API docs in the Qt build using &quot;make docs&quot;
+
+        * WebKit.pro: Include docs.pri for &quot;make docs&quot; target.
+
</ins><span class="cx"> 2009-04-14  Xan Lopez  &lt;xlopez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed version bump in preparation for 1.1.5 release.
</span></span></pre></div>
<a id="trunkWebKitqtApiqwebpagecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/qt/Api/qwebpage.cpp (42813 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/Api/qwebpage.cpp        2009-04-24 06:38:48 UTC (rev 42813)
+++ trunk/WebKit/qt/Api/qwebpage.cpp        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -1255,18 +1255,18 @@
</span><span class="cx"> 
</span><span class="cx">     Suppose we have a \c Thumbnail class as follows:
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/webkit/webpage/main.cpp 0
</del><ins>+    \snippet webkitsnippets/webpage/main.cpp 0
</ins><span class="cx"> 
</span><span class="cx">     The \c Thumbnail's constructor takes in a \a url. We connect our QWebPage
</span><span class="cx">     object's \l{QWebPage::}{loadFinished()} signal to our private slot,
</span><span class="cx">     \c render().
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/webkit/webpage/main.cpp 1
</del><ins>+    \snippet webkitsnippets/webpage/main.cpp 1
</ins><span class="cx"> 
</span><span class="cx">     The \c render() function shows how we can paint a thumbnail using a
</span><span class="cx">     QWebPage object.
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/webkit/webpage/main.cpp 2
</del><ins>+    \snippet webkitsnippets/webpage/main.cpp 2
</ins><span class="cx"> 
</span><span class="cx">     We begin by setting the \l{QWebPage::viewportSize()}{viewportSize} and
</span><span class="cx">     then we instantiate a QImage object, \c image, with the same size as our
</span></span></pre></div>
<a id="trunkWebKitqtApiqwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/qt/Api/qwebview.cpp (42813 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/Api/qwebview.cpp        2009-04-24 06:38:48 UTC (rev 42813)
+++ trunk/WebKit/qt/Api/qwebview.cpp        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">     Qt Widgets, the show() function must be invoked in order to display
</span><span class="cx">     QWebView. The snippet below illustrates this:
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/webkit/simple/main.cpp Using QWebView
</del><ins>+    \snippet webkitsnippets/simple/main.cpp Using QWebView
</ins><span class="cx"> 
</span><span class="cx">     Alternatively, setUrl() can also be used to load a web site. If you have
</span><span class="cx">     the HTML content readily available, you can use setHtml() instead.
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> 
</span><span class="cx">     It is equivalent to
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 0
</del><ins>+    \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 0
</ins><span class="cx"> */
</span><span class="cx"> QWebHistory *QWebView::history() const
</span><span class="cx"> {
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> 
</span><span class="cx">     It is equivalent to
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 1
</del><ins>+    \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 1
</ins><span class="cx"> 
</span><span class="cx">     \sa QWebSettings::globalSettings()
</span><span class="cx"> */
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx">     The following example triggers the copy action and therefore copies any
</span><span class="cx">     selected text to the clipboard.
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 2
</del><ins>+    \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 2
</ins><span class="cx"> 
</span><span class="cx">     \sa pageAction()
</span><span class="cx"> */
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx"> 
</span><span class="cx">     It is equivalent to
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 3
</del><ins>+    \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 3
</ins><span class="cx"> 
</span><span class="cx">     \sa reload(), pageAction(), loadFinished()
</span><span class="cx"> */
</span><span class="lines">@@ -622,7 +622,7 @@
</span><span class="cx"> 
</span><span class="cx">     It is equivalent to
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 4
</del><ins>+    \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 4
</ins><span class="cx"> 
</span><span class="cx">     \sa forward(), pageAction()
</span><span class="cx"> */
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx"> 
</span><span class="cx">     It is equivalent to
</span><span class="cx"> 
</span><del>-    \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 5
</del><ins>+    \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 5
</ins><span class="cx"> 
</span><span class="cx">     \sa back(), pageAction()
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkWebKitqtChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/qt/ChangeLog (42813 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/ChangeLog        2009-04-24 06:38:48 UTC (rev 42813)
+++ trunk/WebKit/qt/ChangeLog        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2009-04-24  Simon Hausmann  &lt;simon.hausmann@nokia.com&gt;
+
+        Reviewed by Ariya Hidayat.
+
+        Added support for generating API docs in the Qt build using &quot;make docs&quot;
+
+        Added code snippets and overview from the Qt sources references in the API docs.
+
+        * Api/qwebpage.cpp: Adjust paths to snippets.
+        * Api/qwebview.cpp: Ditto.
+        * docs/docs.pri: Added.
+        * docs/qtwebkit.qdoc: Added.
+        * docs/qtwebkit.qdocconf: Added.
+        * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added.
+        * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added.
+        * docs/webkitsnippets/simple/main.cpp: Added.
+        * docs/webkitsnippets/simple/simple.pro: Added.
+        * docs/webkitsnippets/webpage/main.cpp: Added.
+        * docs/webkitsnippets/webpage/webpage.pro: Added.
+
</ins><span class="cx"> 2009-04-23  Antonio Gomes   &lt;antonio.gomes@openbossa.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Ariya Hidayat.
</span></span></pre></div>
<a id="trunkWebKitqtdocsdocspri"></a>
<div class="addfile"><h4>Added: trunk/WebKit/qt/docs/docs.pri (0 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/docs/docs.pri                                (rev 0)
+++ trunk/WebKit/qt/docs/docs.pri        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+include(../../../WebKit.pri)
+
+unix {
+    QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/tools/qdoc3/qdoc3
+} else {
+    QDOC = $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
+}
+
+unix {
+docs.commands = $$QDOC $$PWD/qtwebkit.qdocconf
+} else {
+docs.commands = \&quot;$$QDOC $$PWD/qtwebkit.qdocconf\&quot;
+}
+
+QMAKE_EXTRA_TARGETS += docs
</ins></span></pre></div>
<a id="trunkWebKitqtdocsqtwebkitqdoc"></a>
<div class="addfile"><h4>Added: trunk/WebKit/qt/docs/qtwebkit.qdoc (0 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/docs/qtwebkit.qdoc                                (rev 0)
+++ trunk/WebKit/qt/docs/qtwebkit.qdoc        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -0,0 +1,189 @@
</span><ins>+/*!
+    \module QtWebKit
+    \title QtWebKit Module
+    \contentspage Qt's Modules
+    \previouspage QtSvg
+    \nextpage QtXml
+    \ingroup architecture
+    \ingroup modules
+    \brief An introduction to the QtWebKit module.
+
+    \keyword Browser
+    \keyword Web Browser
+
+    \since 4.4
+
+    QtWebKit provides a Web browser engine that makes it easy to embed content
+    from the World Wide Web into your Qt application. At the same time Web
+    content can be enhanced with native controls.
+
+    QtWebKit provides facilities for rendering of HyperText Markup Language
+    (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector
+    Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and
+    scripted with JavaScript.
+
+    A bridge between the JavaScript execution environment and the Qt object
+    model makes it possible for custom QObjects to be scripted. Integration
+    with the Qt networking module enables Web pages to be transparently loaded
+    from Web servers, the local file system or even the Qt resource system.
+
+    In addition to providing pure rendering features, HTML documents can be
+    made fully editable to the user through the use of the \c{contenteditable}
+    attribute on HTML elements.
+
+    QtWebKit is based on the Open Source WebKit engine. More information about
+    WebKit itself can be found on the \l{WebKit Open Source Project} Web site.
+
+    The QtWebKit module is part of the \l{Qt Full Framework Edition}, and the
+    \l{Open Source Versions of Qt}.
+
+    \note Building the QtWebKit module with debugging symbols is problematic
+    on many platforms due to the size of the WebKit engine. We recommend
+    building the module in release mode only for embedded platforms.
+
+    \note Web site icons, also known as &quot;FavIcons&quot;, are currently not supported
+    on Windows. We plan to address this in a future release.
+
+    \note WebKit has certain minimum requirements that must be met on
+    Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements}
+    document for more information.
+
+    Topics:
+
+    \tableofcontents
+
+    \section1 Configuring the Build Process
+
+    Applications that use QtWebKit's classes need to be configured to be built
+    against the QtWebKit module. The following declaration in a \c qmake
+    project file ensures that an application is compiled and linked
+    appropriately:
+
+    \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 0
+
+    This line is necessary because only the QtCore and QtGui modules are used
+    in the default build process.
+
+    To include the definitions of the module's classes, use the following
+    directive:
+
+    \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 1
+
+    \section1 Architecture
+
+    The easiest way to render content is through the QWebView class. As a
+    widget it can be embedded into your forms or a graphics view, and it
+    provides convenience functions for downloading and rendering web sites.
+
+    \snippet webkitsnippets/simple/main.cpp Using QWebView
+
+    QWebView acts as a view onto Web pages, each of which is represented by an
+    instance of the QWebPage class. QWebPage provides access to the document
+    structure in a page, describing features such as frames, the navigation
+    history, and the undo/redo stack for editable content.
+
+    HTML documents can be nested using frames in a frameset. An individual
+    frame in HTML is represented using the QWebFrame class. It includes the
+    bridge to the JavaScript window object and can be painted using QPainter.
+    Each QWebPage has one QWebFrame object as its main frame.
+
+    Individual browser features, defaults and other settings can be configured
+    through the QWebSettings class. It is possible to provide defaults for all
+    QWebPage instances through the default settings. Individual attributes
+    can be overidden by the page specific settings object.
+
+    \section1 Netscape Plugin Support
+
+    Since WebKit supports the Netscape Plugin API, Qt applications can display
+    Web pages that embed common plugins, as long as the user has the appropriate
+    binary files for those plugins installed.
+
+    The following locations are searched for plugins:
+
+    \table
+    \header \o Linux/Unix  \o Windows
+    \row \o{1,3}
+    \list
+    \o \c{.mozilla/plugins} in the user's home directory
+    \o \c{.netscape/plugins} in the user's home directory
+    \o System locations, such as
+    \list
+    \o \c{/usr/lib/browser/plugins}
+    \o \c{/usr/local/lib/mozilla/plugins}
+    \o \c{/usr/lib/firefox/plugins}
+    \o \c{/usr/lib64/browser-plugins}
+    \o \c{/usr/lib/browser-plugins}
+    \o \c{/usr/lib/mozilla/plugins}
+    \o \c{/usr/local/netscape/plugins}
+    \o \c{/opt/mozilla/plugins}
+    \o \c{/opt/mozilla/lib/plugins}
+    \o \c{/opt/netscape/plugins}
+    \o \c{/opt/netscape/communicator/plugins}
+    \o \c{/usr/lib/netscape/plugins}
+    \o \c{/usr/lib/netscape/plugins-libc5}
+    \o \c{/usr/lib/netscape/plugins-libc6}
+    \o \c{/usr/lib64/netscape/plugins}
+    \o \c{/usr/lib64/mozilla/plugins}
+    \endlist
+    \o Locations specified by environment variables:
+    \list
+    \o \c{$MOZILLA_HOME/plugins}
+    \o \c{$MOZ_PLUGIN_PATH}
+    \o \c{$QTWEBKIT_PLUGIN_PATH}
+    \endlist
+    \endlist
+
+    \o
+    \list
+    \o The user's \c{Application Data\Mozilla\plugins} directory
+    \o Standard system locations of plugins for Quicktime, Flash, etc.
+    \endlist
+
+    \row
+    \raw HTML
+    &lt;th class=&quot;qt-style&quot;&gt;Mac OS X&lt;/th&gt;
+    \endraw
+    \row
+    \o
+    \list
+    \o \c{Library/Internet Plug-Ins} in the user's home directory
+    \o The system \c{/Library/Internet Plug-Ins} directory
+    \endlist
+    \endtable
+
+    \section1 License Information
+
+    This is a snapshot of the Qt port of WebKit. The exact version information
+    can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt.
+
+    Qt Commercial Edition licensees that wish to distribute applications that
+    use the QtWebKit module need to be aware of their obligations under the
+    GNU Lesser General Public License (LGPL). 
+
+    Developers using the Open Source Edition can choose to redistribute
+    the module under the appropriate version of the GNU LGPL; version 2.1
+    for applications and libraries licensed under the GNU GPL version 2,
+    or version 3 for applications and libraries licensed under the GNU
+    GPL version 2.
+
+    \legalese
+    WebKit is licensed under the GNU Library General Public License.
+    Individual contributor names and copyright dates can be found
+    inline in the code.
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+    \endlegalese
+*/
</ins></span></pre></div>
<a id="trunkWebKitqtdocsqtwebkitqdocconf"></a>
<div class="addfile"><h4>Added: trunk/WebKit/qt/docs/qtwebkit.qdocconf (0 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/docs/qtwebkit.qdocconf                                (rev 0)
+++ trunk/WebKit/qt/docs/qtwebkit.qdocconf        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -0,0 +1,195 @@
</span><ins>+# Run qdoc from the directory that contains this file.
+
+project     = qtwebkit
+description = &quot;Qt WebKit API Documentation&quot;
+
+headerdirs = $SRCDIR/WebKit/qt/Api
+sourcedirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit/qt/docs
+outputdir = $OUTPUT_DIR/doc/html
+outputformats = HTML
+sources.fileextensions  = &quot;*.cpp *.doc *.qdoc *.h&quot;
+exampledirs = $SRCDIR/WebKit/qt/docs
+
+indexes = $QTDIR/doc/html/qt.index
+
+# macros.qdocconf
+
+macro.aring.HTML        = &quot;&amp;aring;&quot;
+macro.Auml.HTML         = &quot;&amp;Auml;&quot;
+macro.author            = &quot;\\bold{Author:}&quot;
+macro.br.HTML           = &quot;&lt;br /&gt;&quot;
+macro.BR.HTML           = &quot;&lt;br /&gt;&quot;
+macro.aacute.HTML       = &quot;&amp;aacute;&quot;
+macro.eacute.HTML       = &quot;&amp;eacute;&quot;
+macro.iacute.HTML       = &quot;&amp;iacute;&quot;
+macro.gui               = &quot;\\bold&quot;
+macro.hr.HTML           = &quot;&lt;hr /&gt;&quot;
+macro.key               = &quot;\\bold&quot;
+macro.menu              = &quot;\\bold&quot;
+macro.note              = &quot;\\bold{Note:}&quot;
+macro.oslash.HTML       = &quot;&amp;oslash;&quot;
+macro.ouml.HTML         = &quot;&amp;ouml;&quot;
+macro.QA                = &quot;\\e{Qt Assistant}&quot;
+macro.QD                = &quot;\\e{Qt Designer}&quot;
+macro.QL                = &quot;\\e{Qt Linguist}&quot;
+macro.param             = &quot;\\e&quot;
+macro.raisedaster.HTML  = &quot;&lt;sup&gt;*&lt;/sup&gt;&quot;
+macro.reg.HTML          = &quot;&lt;sup&gt;&amp;reg;&lt;/sup&gt;&quot;
+macro.return            = &quot;Returns&quot;
+macro.starslash         = &quot;\\c{*/}&quot;
+macro.uuml.HTML         = &quot;&amp;uuml;&quot;
+macro.mdash.HTML        = &quot;&amp;mdash;&quot;
+
+# compat.qdocconf
+
+alias.i                                = e
+alias.include                        = input
+
+macro.0                         = &quot;\\\\0&quot;
+macro.b                         = &quot;\\\\b&quot;
+macro.n                         = &quot;\\\\n&quot;
+macro.r                         = &quot;\\\\r&quot;
+macro.i                         = &quot;\\o&quot;
+macro.i11                       = &quot;\\o{1,1}&quot;
+macro.i12                       = &quot;\\o{1,2}&quot;
+macro.i13                       = &quot;\\o{1,3}&quot;
+macro.i14                       = &quot;\\o{1,4}&quot;
+macro.i15                       = &quot;\\o{1,5}&quot;
+macro.i16                       = &quot;\\o{1,6}&quot;
+macro.i17                       = &quot;\\o{1,7}&quot;
+macro.i18                       = &quot;\\o{1,8}&quot;
+macro.i19                       = &quot;\\o{1,9}&quot;
+macro.i21                       = &quot;\\o{2,1}&quot;
+macro.i31                       = &quot;\\o{3,1}&quot;
+macro.i41                       = &quot;\\o{4,1}&quot;
+macro.i51                       = &quot;\\o{5,1}&quot;
+macro.i61                       = &quot;\\o{6,1}&quot;
+macro.i71                       = &quot;\\o{7,1}&quot;
+macro.i81                       = &quot;\\o{8,1}&quot;
+macro.i91                       = &quot;\\o{9,1}&quot;
+macro.img                       = &quot;\\image&quot;
+macro.endquote                  = &quot;\\endquotation&quot;
+
+spurious                        = &quot;Missing comma in .*&quot; \
+                                  &quot;Missing pattern .*&quot;
+
+# Doxygen compatibility commands
+
+macro.see                       = &quot;\\sa&quot;
+macro.function                  = &quot;\\fn&quot;
+
+# qt-cpp-ignore.qdocconf
+
+Cpp.ignoretokens        = QAXFACTORY_EXPORT \
+                          QDESIGNER_COMPONENTS_LIBRARY \
+                          QDESIGNER_EXTENSION_LIBRARY \
+                          QDESIGNER_SDK_LIBRARY \
+                          QDESIGNER_SHARED_LIBRARY \
+                          QDESIGNER_UILIB_LIBRARY \
+                          QM_EXPORT_CANVAS \
+                          QM_EXPORT_DNS \
+                          QM_EXPORT_DOM \
+                          QM_EXPORT_FTP \
+                          QM_EXPORT_HTTP \
+                          QM_EXPORT_ICONVIEW \
+                          QM_EXPORT_NETWORK \
+                          QM_EXPORT_OPENGL \
+                          QM_EXPORT_SQL \
+                          QM_EXPORT_TABLE \
+                          QM_EXPORT_WORKSPACE \
+                          QM_EXPORT_XML \
+                          QT_ASCII_CAST_WARN \
+                          QT_ASCII_CAST_WARN_CONSTRUCTOR \
+                          QT_BEGIN_HEADER \
+                          QT_DESIGNER_STATIC \
+                          QT_END_HEADER \
+                          QT_FASTCALL \
+                          QT_WIDGET_PLUGIN_EXPORT \
+                          Q_COMPAT_EXPORT \
+                          Q_CORE_EXPORT \
+                          Q_EXPLICIT \
+                          Q_EXPORT \
+                          Q_EXPORT_CODECS_CN \
+                          Q_EXPORT_CODECS_JP \
+                          Q_EXPORT_CODECS_KR \
+                          Q_EXPORT_PLUGIN \
+                          Q_GFX_INLINE \
+                          Q_GUI_EXPORT \
+                          Q_GUI_EXPORT_INLINE \
+                          Q_GUI_EXPORT_STYLE_CDE \
+                          Q_GUI_EXPORT_STYLE_COMPACT \
+                          Q_GUI_EXPORT_STYLE_MAC \
+                          Q_GUI_EXPORT_STYLE_MOTIF \
+                          Q_GUI_EXPORT_STYLE_MOTIFPLUS \
+                          Q_GUI_EXPORT_STYLE_PLATINUM \
+                          Q_GUI_EXPORT_STYLE_POCKETPC \
+                          Q_GUI_EXPORT_STYLE_SGI \
+                          Q_GUI_EXPORT_STYLE_WINDOWS \
+                          Q_GUI_EXPORT_STYLE_WINDOWSXP \
+                          QHELP_EXPORT \
+                          Q_INLINE_TEMPLATE \
+                          Q_INTERNAL_WIN_NO_THROW \
+                          Q_NETWORK_EXPORT \
+                          Q_OPENGL_EXPORT \
+                          Q_OUTOFLINE_TEMPLATE \
+                          Q_SQL_EXPORT \
+                          Q_SVG_EXPORT \
+                          Q_SCRIPT_EXPORT \
+                          Q_TESTLIB_EXPORT \
+                          Q_TYPENAME \
+                          Q_XML_EXPORT \
+                          Q_XMLSTREAM_EXPORT \
+                          Q_XMLPATTERNS_EXPORT \
+                          QDBUS_EXPORT \
+                          QT_BEGIN_NAMESPACE \
+                          QT_BEGIN_INCLUDE_NAMESPACE \
+                          QT_END_NAMESPACE \
+                          QT_END_INCLUDE_NAMESPACE \
+                          PHONON_EXPORT \
+                          EXTENSIONSYSTEM_EXPORT
+Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
+                          Q_DECLARE_INTERFACE \
+                          Q_DECLARE_METATYPE \
+                          Q_DECLARE_OPERATORS_FOR_FLAGS \
+                          Q_DECLARE_PRIVATE \
+                          Q_DECLARE_PUBLIC \
+                          Q_DECLARE_SHARED \
+                          Q_DECLARE_TR_FUNCTIONS \
+                          Q_DECLARE_TYPEINFO \
+                          Q_DISABLE_COPY \
+                          QT_FORWARD_DECLARE_CLASS \
+                          Q_DUMMY_COMPARISON_OPERATOR \
+                          Q_ENUMS \
+                          Q_FLAGS \
+                          Q_INTERFACES \
+                          __attribute__ \
+                          K_DECLARE_PRIVATE \
+                          PHONON_OBJECT \
+                          PHONON_HEIR
+
+
+
+HTML.style              = &quot;&quot; \
+                          &quot;h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }&quot;\
+                          &quot;a:link { color: #004faf; text-decoration: none }&quot;\
+                          &quot;a:visited { color: #672967; text-decoration: none }&quot;\
+                          &quot;td.postheader { font-family: sans-serif }&quot;\
+                          &quot;tr.address { font-family: sans-serif }&quot;\
+                          &quot;body { background: #ffffff; color: black }&quot;\
+                          &quot;table tr.odd { background: #f0f0f0; color: black; }&quot;\
+                          &quot;table tr.even { background: #e4e4e4; color: black; }&quot;\
+                          &quot;table.annotated th { padding: 3px; text-align: left }&quot;\
+                          &quot;table.annotated td { padding: 3px; } &quot;\
+                          &quot;table tr pre { padding-top: none; padding-bottom: none; padding-left: none; padding-right: none; border: none; background: none }&quot;\
+                          &quot;tr.qt-style { background: #a2c511; color: black }&quot;\
+                          &quot;body pre { padding: 0.2em; border: #e7e7e7 1px solid; background: #f1f1f1; color: black }&quot;\
+                          &quot;span.preprocessor, span.preprocessor a { color: darkblue; }&quot;\
+                          &quot;span.comment { color: darkred; font-style: italic }&quot;\
+                          &quot;span.string,span.char { color: darkgreen; }&quot;\
+                          &quot;.title { text-align: center }&quot;\
+                          &quot;.subtitle { font-size: 0.8em }&quot;\
+                          &quot;.small-subtitle { font-size: 0.65em }&quot;
+
+HTML.postheader         = &quot;&quot;
+
+HTML.footer             = &quot;&quot;
</ins></span></pre></div>
<a id="trunkWebKitqtdocswebkitsnippetsqtwebkit_build_snippetqdoc"></a>
<div class="addfile"><h4>Added: trunk/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc (0 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc                                (rev 0)
+++ trunk/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+//! [0]
+QT += webkit
+//! [0]
+
+
+//! [1]
+#include &lt;QtWebKit&gt;
+//! [1]
</ins></span></pre></div>
<a id="trunkWebKitqtdocswebkitsnippetsqtwebkit_qwebview_snippetcpp"></a>
<div class="addfile"><h4>Added: trunk/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp (0 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp                                (rev 0)
+++ trunk/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+
+void wrapInFunction()
+{
+
+//! [0]
+    view-&gt;page()-&gt;history();
+//! [0]
+
+
+//! [1]
+    view-&gt;page()-&gt;settings();
+//! [1]
+
+
+//! [2]
+    view-&gt;triggerAction(QWebPage::Copy);
+//! [2]
+
+
+//! [3]
+    view-&gt;page()-&gt;triggerPageAction(QWebPage::Stop);
+//! [3]
+
+
+//! [4]
+    view-&gt;page()-&gt;triggerPageAction(QWebPage::GoBack);
+//! [4]
+
+
+//! [5]
+    view-&gt;page()-&gt;triggerPageAction(QWebPage::GoForward);
+//! [5]
+
+}
+
</ins></span></pre></div>
<a id="trunkWebKitqtdocswebkitsnippetssimplemaincpp"></a>
<div class="addfile"><h4>Added: trunk/WebKit/qt/docs/webkitsnippets/simple/main.cpp (0 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/docs/webkitsnippets/simple/main.cpp                                (rev 0)
+++ trunk/WebKit/qt/docs/webkitsnippets/simple/main.cpp        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+/*
+    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include &lt;QApplication&gt;
+#include &lt;QUrl&gt;
+#include &lt;QWebView&gt;
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QWidget *parent = 0;
+//! [Using QWebView]
+    QWebView *view = new QWebView(parent);
+    view-&gt;load(QUrl(&quot;http://qtsoftware.com/&quot;));
+    view-&gt;show();
+//! [Using QWebView]
+    return app.exec();
+}
</ins></span></pre></div>
<a id="trunkWebKitqtdocswebkitsnippetssimplesimplepro"></a>
<div class="addfile"><h4>Added: trunk/WebKit/qt/docs/webkitsnippets/simple/simple.pro (0 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/docs/webkitsnippets/simple/simple.pro                                (rev 0)
+++ trunk/WebKit/qt/docs/webkitsnippets/simple/simple.pro        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+QT       += webkit
+SOURCES   = main.cpp
</ins></span></pre></div>
<a id="trunkWebKitqtdocswebkitsnippetswebpagemaincpp"></a>
<div class="addfile"><h4>Added: trunk/WebKit/qt/docs/webkitsnippets/webpage/main.cpp (0 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/docs/webkitsnippets/webpage/main.cpp                                (rev 0)
+++ trunk/WebKit/qt/docs/webkitsnippets/webpage/main.cpp        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+/*
+    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include &lt;QtGui&gt;
+#include &lt;QWebPage&gt;
+#include &lt;QWebFrame&gt;
+
+//! [0]
+class Thumbnailer : public QObject
+{
+    Q_OBJECT
+
+public:
+    Thumbnailer(const QUrl &amp;url);
+
+signals:
+    void finished();
+
+private slots:
+    void render();
+
+private:
+    QWebPage page;
+
+};
+//! [0]
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    Thumbnailer thumbnail(QUrl(&quot;http://qtsoftware.com&quot;));
+
+    QObject::connect(&amp;thumbnail, SIGNAL(finished()),
+        &amp;app, SLOT(quit()));
+
+    return app.exec();
+}
+
+//! [1]
+Thumbnailer::Thumbnailer(const QUrl &amp;url)
+{
+    page.mainFrame()-&gt;load(url);
+    connect(&amp;page, SIGNAL(loadFinished(bool)),
+        this, SLOT(render()));
+}
+//! [1]
+
+//! [2]
+void Thumbnailer::render()
+{
+    page.setViewportSize(page.mainFrame()-&gt;contentsSize());
+    QImage image(page.viewportSize(), QImage::Format_ARGB32);
+    QPainter painter(&amp;image);
+
+    page.mainFrame()-&gt;render(&amp;painter);
+    painter.end();
+
+    QImage thumbnail = image.scaled(400, 400);
+    thumbnail.save(&quot;thumbnail.png&quot;);
+
+    emit finished();
+}
+//! [2]
+#include &quot;main.moc&quot;
</ins></span></pre></div>
<a id="trunkWebKitqtdocswebkitsnippetswebpagewebpagepro"></a>
<div class="addfile"><h4>Added: trunk/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro (0 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro                                (rev 0)
+++ trunk/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+CONFIG += console
+QT += webkit
+SOURCES = main.cpp
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkWebKitpro"></a>
<div class="modfile"><h4>Modified: trunk/WebKit.pro (42813 => 42814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit.pro        2009-04-24 06:38:48 UTC (rev 42813)
+++ trunk/WebKit.pro        2009-04-24 10:30:07 UTC (rev 42814)
</span><span class="lines">@@ -9,3 +9,4 @@
</span><span class="cx"> 
</span><span class="cx"> !win32: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
</span><span class="cx"> 
</span><ins>+include(WebKit/qt/docs/docs.pri)
</ins></span></pre>
</div>
</div>

</body>
</html>