diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:02:21 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:02:21 (GMT) |
| commit | e658bcb0e64acca9684f0897510d639af98ab552 (patch) | |
| tree | 5f2f155093238f0b6e808bc0d6cb54b3bf0b6c4f /src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | |
| parent | bb35c5aaa2ad80eaa7f88df6d83945adbf9bde92 (diff) | |
| parent | 1ffaf40f5cffca57d7e116d61935ccd034239222 (diff) | |
| download | Qt-e658bcb0e64acca9684f0897510d639af98ab552.zip Qt-e658bcb0e64acca9684f0897510d639af98ab552.tar.gz Qt-e658bcb0e64acca9684f0897510d639af98ab552.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index c7515ab..3c5f89f 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -650,6 +650,7 @@ qreal QWebView::textSizeMultiplier() const return page()->mainFrame()->textSizeMultiplier(); } +#if !defined(Q_OS_SYMBIAN) /*! \property QWebView::renderHints \since 4.6 @@ -661,6 +662,7 @@ qreal QWebView::textSizeMultiplier() const \sa QPainter::renderHints() */ +#endif QPainter::RenderHints QWebView::renderHints() const { return d->renderHints; |