summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxwebview.h
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-04-27 06:52:38 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2009-04-27 06:52:38 (GMT)
commit6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb (patch)
tree68d6c4928dbd91d50e08b5b9d09a1178dffad092 /src/declarative/fx/qfxwebview.h
parent5d8ce4c43c3c2816cd5dca03ddd429f26b96d34d (diff)
parent7e94543a9b013b6b1140137ba64406b74a363afc (diff)
downloadQt-6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb.zip
Qt-6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb.tar.gz
Qt-6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb.tar.bz2
Merge branch 'kinetic-declarativeui' of git://scm.dev.nokia.troll.no/qt/kinetic into kinetic-declarativeui-qfx
Diffstat (limited to 'src/declarative/fx/qfxwebview.h')
-rw-r--r--src/declarative/fx/qfxwebview.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index 463d0c4..1eede52 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -92,8 +92,10 @@ class Q_DECLARATIVE_EXPORT QFxWebView : public QFxItem
Q_PROPERTY(int idealHeight READ idealHeight WRITE setIdealHeight NOTIFY idealHeightChanged)
Q_PROPERTY(QString url READ url WRITE setUrl NOTIFY urlChanged)
Q_PROPERTY(bool smooth READ smooth WRITE setSmooth)
- Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged())
+ Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+
Q_PROPERTY(bool interactive READ interactive WRITE setInteractive NOTIFY interactiveChanged)
+
Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize)
Q_PROPERTY(QObject* reload READ reloadAction)