diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-03 12:38:35 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-03 12:38:35 (GMT) |
| commit | 22ea0648e446136cc2a301ec3a38019ed6a3bd6e (patch) | |
| tree | 22466b217156cdca9207ac215ac6a34681af659e /src/3rdparty | |
| parent | 1e7ab0e849900bacf71935f2a2150116b8dc17d1 (diff) | |
| parent | 2bbd2780b9028f9d765384868796424582b2fe6a (diff) | |
| download | Qt-22ea0648e446136cc2a301ec3a38019ed6a3bd6e.zip Qt-22ea0648e446136cc2a301ec3a38019ed6a3bd6e.tar.gz Qt-22ea0648e446136cc2a301ec3a38019ed6a3bd6e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp index 7a8aae7..4238d33 100644 --- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp @@ -742,11 +742,11 @@ QWebPage* QDeclarativeWebView::page() const See QWebSettings for details of these properties. \qml - WebView { - settings.pluginsEnabled: true - settings.standardFontFamily: "Arial" - ... - } + WebView { + settings.pluginsEnabled: true + settings.standardFontFamily: "Arial" + // ... + } \endqml */ QDeclarativeWebSettings* QDeclarativeWebView::settingsObject() const |