diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-18 04:54:42 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-18 04:54:42 (GMT) |
| commit | 1a226c81b7461b793fb94df5817701caef9c2014 (patch) | |
| tree | cab4176bc0a44481f236fe92198ece3f8b8205ad /src/declarative/fx/qfxwebview.h | |
| parent | da856f75cc7631d09647adaf76cbaa9d1c0405b0 (diff) | |
| parent | e4fad48d5e5ac227381bb9fba05dfb31a8338ed5 (diff) | |
| download | Qt-1a226c81b7461b793fb94df5817701caef9c2014.zip Qt-1a226c81b7461b793fb94df5817701caef9c2014.tar.gz Qt-1a226c81b7461b793fb94df5817701caef9c2014.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxwebview.h')
| -rw-r--r-- | src/declarative/fx/qfxwebview.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h index 498cf2e..d619e94 100644 --- a/src/declarative/fx/qfxwebview.h +++ b/src/declarative/fx/qfxwebview.h @@ -92,6 +92,7 @@ class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem Q_PROPERTY(int idealWidth READ idealWidth WRITE setIdealWidth NOTIFY idealWidthChanged) Q_PROPERTY(int idealHeight READ idealHeight WRITE setIdealHeight NOTIFY idealHeightChanged) + Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize) Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged) @@ -186,7 +187,7 @@ Q_SIGNALS: void doubleClick(); public Q_SLOTS: - QVariant evaluateJavaScript (const QString&); + QVariant evaluateJavaScript (const QString&); private Q_SLOTS: void expandToWebPage(); @@ -209,7 +210,7 @@ protected: void keyPressEvent(QKeyEvent* event); void keyReleaseEvent(QKeyEvent* event); void timerEvent(QTimerEvent *event); - virtual void geometryChanged(const QRectF &newGeometry, + virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); virtual void focusChanged(bool); |