Merge branch 'kinetic-declarativeui' into kinetic-declarativeui-gv

Conflicts:
	src/declarative/canvas/qsimplecanvasitem.cpp
	src/declarative/canvas/qsimplecanvasitem_p.h
	src/declarative/fx/qfxwebview.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index 85c17d7..897b6cc 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -81,6 +81,7 @@ class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QPixmap icon READ icon NOTIFY iconChanged)
     Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
+    Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
     Q_PROPERTY(QString status READ status NOTIFY statusChanged)
 
     Q_PROPERTY(int mouseX READ mouseX)
@@ -95,8 +96,6 @@ class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem
 
     Q_PROPERTY(bool interactive READ interactive WRITE setInteractive NOTIFY interactiveChanged)
 
-    Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize)
-
     Q_PROPERTY(QObject* reload READ reloadAction)
     Q_PROPERTY(QObject* back READ backAction)
     Q_PROPERTY(QObject* forward READ forwardAction)
@@ -118,12 +117,12 @@ public:
     qreal textSizeMultiplier() const;
     void setTextSizeMultiplier(qreal);
 
+    qreal zoomFactor() const;
+    void setZoomFactor(qreal);
+
     bool interactive() const;
     void setInteractive(bool);
 
-    int cacheSize() const;
-    void setCacheSize(int pixels);
-
     int mouseX() const;
     int mouseY() const;
 
@@ -169,6 +168,7 @@ Q_SIGNALS:
     void titleChanged(const QString&);
     void iconChanged();
     void statusChanged();
+    void zoomFactorChanged();
 
     void loadStarted();
     void loadFinished();