Changeset 846 for trunk/src/3rdparty/webkit/WebKit/qt/docs

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/webkit/WebKit/qt/docs/docs.pri (modified) (1 diff)
• src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc )
• src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc (modified) (4 diffs)
• src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf (modified) (1 diff)
• src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp )
• src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp (modified) (1 diff)
• src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp (modified) (3 diffs)

trunk/src/3rdparty/webkit/WebKit/qt/docs/docs.pri

@@ -4 +4 @@
     QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/bin/qdoc3
 } else {
-    QDOC = $$(QTDIR)\bin\qdoc3.exe
+    QDOC = $$(QTDIR)\\qdoc3.exe
 }
 

trunk/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc

@@ -1 +1 @@
 /*!
     \module QtWebKit
-    \title QtWebKit Module
+    \title 
     \contentspage All Qt Modules
     \previouspage QtSvg
     \nextpage QtXml
     \ingroup modules
+
+
     \brief The QtWebKit module provides a web browser engine as well as
     classes to render and interact with web content.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     To include the definitions of the module's classes, use the
@@ -19 +45 @@
     \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 0
 
-    \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 Library General Public License (LGPL).
-
-    Developers using the Open Source Edition can choose to redistribute
-    the module under the appropriate version of the GNU LGPL.
-
-    \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
-*/
-
-/*!
-    \page webintegration.html
-    \title Integrating Web Content with QtWebKit
-    \since 4.4
-
-    \ingroup frameworks-technologies
-
-    \keyword Browser
-    \keyword Web Browser
-
-    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}.
+    \section1 Notes 
 
     \note Building the QtWebKit module with debugging symbols is problematic
@@ -100 +60 @@
     Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements}
     document for more information.
-
-    Topics:
-
-    \tableofcontents
 
     \section1 Architecture
@@ -197 +153 @@
     \endlist
     \endtable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 */
+

trunk/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf

@@ -4 +4 @@
 description = "Qt WebKit API Documentation"
 
-headerdirs = $SRCDIR/WebKit/qt/Api
-sourcedirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit/qt/docs
+headerdirs = $SRCDIR/WebKit/qt/Api
+sourcedirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit/qt/docs
 outputdir = $OUTPUT_DIR/doc/html
 outputformats = HTML

trunk/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp

@@ -10 +10 @@
     QWebInspector *inspector = new QWebInspector;
     inspector->setPage(page);
-
-    connect(page, SIGNAL(webInspectorTriggered(QWebElement)), inspector, SLOT(show()));
 //! [0]
 

trunk/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp

@@ -37 +37 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static void findAll()
 {
@@ -54 +107 @@
 
 //! [FindAll intro]
-    QList<QWebElement> allSpans = document.findAll("span");
-    QList<QWebElement> introSpans = document.findAll("p.intro span");
+    Q allSpans = document.findAll("span");
+    Q introSpans = document.findAll("p.intro span");
 //! [FindAll intro] //! [FindAll]
 }
@@ -66 +119 @@
     traverse();
     findAll();
+
+
+
     return 0;
 }