Changeset 78266 in webkit


Ignore:
Timestamp:
Feb 10, 2011 1:59:52 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-02-10 Ademar de Souza Reis Jr <Ademar Reis>

Reviewed by Andreas Kling.

[Qt] Misc documentation fixes/updates
https://bugs.webkit.org/show_bug.cgi?id=54236

There are a few commits in the Qt repository (master and 4.7 branches)
with QtWebKit documentation fixes:

84d278501a19eaccf9a77cccd95ca5d17a2dcd2b
Clarified documentation of loadFinished() signal

eebe205b306daaa3674d9746de11a73bef4bd0de
Doc: Fixed QML, unindented snippet

b0d64717d2c541976dc5524e4100c62f060e206f
doc: Changed a table into 3 tables to eliminate a \raw.

As these are all minor doc changes, I decided to group them
into one single patch.

  • Api/qwebpage.cpp:
  • declarative/qdeclarativewebview.cpp:
  • docs/qtwebkit.qdoc:
Location:
trunk/Source/WebKit/qt
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/qt/Api/qwebpage.cpp

    r78135 r78266  
    18871887    loadProgress() signal, on the other hand, is emitted whenever an element
    18881888    of the web page completes loading, such as an embedded image, a script,
    1889     etc. Finally, the loadFinished() signal is emitted when the page has
    1890     loaded completely. Its argument, either true or false, indicates whether
    1891     or not the load operation succeeded.
     1889    etc. Finally, the loadFinished() signal is emitted when the page contents
     1890    are loaded completely, independent of script execution or page rendering.
     1891    Its argument, either true or false, indicates whether or not the load
     1892    operation succeeded.
    18921893
    18931894    \section1 Using QWebPage in a Widget-less Environment
     
    39893990    \fn void QWebPage::loadStarted()
    39903991
    3991     This signal is emitted when a new load of the page is started.
     3992    This signal is emitted when a page starts loading content.
    39923993
    39933994    \sa loadFinished()
     
    40084009    \fn void QWebPage::loadFinished(bool ok)
    40094010
    4010     This signal is emitted when a load of the page is finished.
     4011    This signal is emitted when the page finishes loading content. This signal
     4012    is independant of script execution or page rendering.
    40114013    \a ok will indicate whether the load was successful or any error occurred.
    40124014
  • trunk/Source/WebKit/qt/ChangeLog

    r78263 r78266  
     12011-02-10  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Misc documentation fixes/updates
     6        https://bugs.webkit.org/show_bug.cgi?id=54236
     7
     8        There are a few commits in the Qt repository (master and 4.7 branches)
     9        with QtWebKit documentation fixes:
     10
     11        84d278501a19eaccf9a77cccd95ca5d17a2dcd2b
     12        Clarified documentation of loadFinished() signal
     13
     14        eebe205b306daaa3674d9746de11a73bef4bd0de
     15        Doc: Fixed QML, unindented snippet
     16
     17        b0d64717d2c541976dc5524e4100c62f060e206f
     18        doc: Changed a table into 3 tables to eliminate a \raw.
     19
     20        As these are all minor doc changes, I decided to group them
     21        into one single patch.
     22
     23        * Api/qwebpage.cpp:
     24        * declarative/qdeclarativewebview.cpp:
     25        * docs/qtwebkit.qdoc:
     26
    1272011-02-10  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>
    228
  • trunk/Source/WebKit/qt/declarative/qdeclarativewebview.cpp

    r75119 r78266  
    731731
    732732    \qml
    733         WebView {
    734             settings.pluginsEnabled: true
    735             settings.standardFontFamily: "Arial"
    736             ...
    737         }
     733    WebView {
     734        settings.pluginsEnabled: true
     735        settings.standardFontFamily: "Arial"
     736        // ...
     737    }
    738738    \endqml
    739739*/
  • trunk/Source/WebKit/qt/docs/qtwebkit.qdoc

    r75313 r78266  
    104104
    105105    \table
    106     \header \o Linux/Unix (X11)  \o Windows
    107     \row \o{1,3}
     106    \header \o Linux/Unix (X11)
     107    \row \o
    108108    \list
    109109    \o \c{.mozilla/plugins} in the user's home directory
     
    135135    \endlist
    136136    \endlist
     137    \endtable
    137138
    138     \o
     139    \table
     140    \header  \o Windows
     141    \row \o
    139142    \list
    140143    \o The user's \c{Application Data\Mozilla\plugins} directory
    141144    \o Standard system locations of plugins for Quicktime, Flash, etc.
    142145    \endlist
     146    \endtable
    143147
    144     \row
    145     \raw HTML
    146     <th class="qt-style">Mac OS X</th>
    147     \endraw
    148     \row
    149     \o
     148    \table
     149    \header \o Mac OS X
     150    \row \o
    150151    \list
    151152    \o \c{Library/Internet Plug-Ins} in the user's home directory
Note: See TracChangeset for help on using the changeset viewer.