diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-07-27 12:19:55 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-07-27 12:19:55 (GMT) |
| commit | 4b696ce11ffed279ed92c63bb85cbcdaab818033 (patch) | |
| tree | 1c803fe730b7e90679b253bbf599e5ec092059c6 /src/3rdparty/webkit | |
| parent | ed00fff3cb3f3f1ec01f5d69168222c3ce8d51b2 (diff) | |
| parent | 29031b406f0266b0b47ef7e8113ec861a90f201e (diff) | |
| download | Qt-4b696ce11ffed279ed92c63bb85cbcdaab818033.zip Qt-4b696ce11ffed279ed92c63bb85cbcdaab818033.tar.gz Qt-4b696ce11ffed279ed92c63bb85cbcdaab818033.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebview.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index 34da644..6c5860c 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -617,6 +617,8 @@ qreal QWebView::textSizeMultiplier() const These hints are used to initialize QPainter before painting the web page. QPainter::TextAntialiasing is enabled by default. + + \sa QPainter::renderHints() */ QPainter::RenderHints QWebView::renderHints() const { diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h index 5c2c7a0..0dab925 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h @@ -106,7 +106,7 @@ public: QPainter::RenderHints renderHints() const; void setRenderHints(QPainter::RenderHints hints); - void setRenderHint(QPainter::RenderHint hint, bool enabled); + void setRenderHint(QPainter::RenderHint hint, bool enabled = true); bool findText(const QString &subString, QWebPage::FindFlags options = 0); |