Ignore:
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:
6 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk

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

    r561 r846  
    44    QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/bin/qdoc3
    55} else {
    6     QDOC = $$(QTDIR)\bin\qdoc3.exe
     6    QDOC = $$(QTDIR)\\qdoc3.exe
    77}
    88
  • trunk/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc

    r561 r846  
    11/*!
    22    \module QtWebKit
    3     \title QtWebKit Module
     3    \title
    44    \contentspage All Qt Modules
    55    \previouspage QtSvg
    66    \nextpage QtXml
    77    \ingroup modules
     8
     9
    810    \brief The QtWebKit module provides a web browser engine as well as
    911    classes to render and interact with web content.
     12
     13
     14
     15
     16
     17
     18
     19
     20
     21
     22
     23
     24
     25
     26
     27
     28
     29
     30
     31
     32
     33
     34
     35
    1036
    1137    To include the definitions of the module's classes, use the
     
    1945    \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 0
    2046
    21     \section1 License Information
    22 
    23     This is a snapshot of the Qt port of WebKit. The exact version information
    24     can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt.
    25 
    26     Qt Commercial Edition licensees that wish to distribute applications that
    27     use the QtWebKit module need to be aware of their obligations under the
    28     GNU Library General Public License (LGPL).
    29 
    30     Developers using the Open Source Edition can choose to redistribute
    31     the module under the appropriate version of the GNU LGPL.
    32 
    33     \legalese
    34     WebKit is licensed under the GNU Library General Public License.
    35     Individual contributor names and copyright dates can be found
    36     inline in the code.
    37 
    38     This library is free software; you can redistribute it and/or
    39     modify it under the terms of the GNU Library General Public
    40     License as published by the Free Software Foundation; either
    41     version 2 of the License, or (at your option) any later version.
    42 
    43     This library is distributed in the hope that it will be useful,
    44     but WITHOUT ANY WARRANTY; without even the implied warranty of
    45     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    46     Library General Public License for more details.
    47 
    48     You should have received a copy of the GNU Library General Public License
    49     along with this library; see the file COPYING.LIB.  If not, write to
    50     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    51     Boston, MA 02110-1301, USA.
    52     \endlegalese
    53 */
    54 
    55 /*!
    56     \page webintegration.html
    57     \title Integrating Web Content with QtWebKit
    58     \since 4.4
    59 
    60     \ingroup frameworks-technologies
    61 
    62     \keyword Browser
    63     \keyword Web Browser
    64 
    65     QtWebKit provides a Web browser engine that makes it easy to embed content
    66     from the World Wide Web into your Qt application. At the same time Web
    67     content can be enhanced with native controls.
    68 
    69     QtWebKit provides facilities for rendering of HyperText Markup Language
    70     (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector
    71     Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and
    72     scripted with JavaScript.
    73 
    74     A bridge between the JavaScript execution environment and the Qt object
    75     model makes it possible for custom QObjects to be scripted. Integration
    76     with the Qt networking module enables Web pages to be transparently loaded
    77     from Web servers, the local file system or even the Qt resource system.
    78 
    79     In addition to providing pure rendering features, HTML documents can be
    80     made fully editable to the user through the use of the \c{contenteditable}
    81     attribute on HTML elements.
    82 
    83     QtWebKit is based on the Open Source WebKit engine. More information about
    84     WebKit itself can be found on the \l{WebKit Open Source Project} Web site.
    85 
    86     The QtWebKit module is part of the \l{Qt Full Framework Edition}, and the
    87     \l{Open Source Versions of Qt}.
     47    \section1 Notes
    8848
    8949    \note Building the QtWebKit module with debugging symbols is problematic
     
    10060    Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements}
    10161    document for more information.
    102 
    103     Topics:
    104 
    105     \tableofcontents
    10662
    10763    \section1 Architecture
     
    197153    \endlist
    198154    \endtable
     155
     156
     157
     158
     159
     160
     161
     162
     163
     164