diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-15 09:06:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-15 09:31:31 (GMT) |
| commit | c411f16870f112c3407c28c22b617f613a82cff4 (patch) | |
| tree | 29a1bcd590c8b31af2aab445bfe8a978dc5bf582 /src/3rdparty/webkit/WebKit/qt/Api/qwebview.h | |
| parent | 3d77b56b32a0c53ec0bbfaa07236fedb900ff336 (diff) | |
| download | Qt-c411f16870f112c3407c28c22b617f613a82cff4.zip Qt-c411f16870f112c3407c28c22b617f613a82cff4.tar.gz Qt-c411f16870f112c3407c28c22b617f613a82cff4.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-15062009 ( 65232bf00dc494ebfd978f998c88f58d18ecce1e )
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebview.h')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebview.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h index 1172f39..5c2c7a0 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h @@ -25,6 +25,7 @@ #include "qwebpage.h" #include <QtGui/qwidget.h> #include <QtGui/qicon.h> +#include <QtGui/qpainter.h> #include <QtCore/qurl.h> #if QT_VERSION >= 0x040400 #include <QtNetwork/qnetworkaccessmanager.h> @@ -50,6 +51,8 @@ class QWEBKIT_EXPORT QWebView : public QWidget //Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags) Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false) Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor) + Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints) + Q_FLAGS(QPainter::RenderHints) public: explicit QWebView(QWidget *parent = 0); virtual ~QWebView(); @@ -57,6 +60,8 @@ public: QWebPage *page() const; void setPage(QWebPage *page); + static QUrl guessUrlFromString(const QString &string); + void load(const QUrl &url); #if QT_VERSION < 0x040400 && !defined(qdoc) void load(const QWebNetworkRequest &request); @@ -99,6 +104,10 @@ public: void setTextSizeMultiplier(qreal factor); qreal textSizeMultiplier() const; + QPainter::RenderHints renderHints() const; + void setRenderHints(QPainter::RenderHints hints); + void setRenderHint(QPainter::RenderHint hint, bool enabled); + bool findText(const QString &subString, QWebPage::FindFlags options = 0); virtual bool event(QEvent *); |