diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-24 01:55:20 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-24 01:55:20 (GMT) |
| commit | c9ed65f66a61c4149995dcc4c986a28ab2b4f124 (patch) | |
| tree | ba6d6d71385707143f72c5dafb81f35302592d2d /src/declarative/fx/qfxwebview.h | |
| parent | a750ae1a0b568cdd7e52a0c8aea456b0bae16f0d (diff) | |
| parent | 23c9370fb8e25fc814fe057c7ad92f70f34a937b (diff) | |
| download | Qt-c9ed65f66a61c4149995dcc4c986a28ab2b4f124.zip Qt-c9ed65f66a61c4149995dcc4c986a28ab2b4f124.tar.gz Qt-c9ed65f66a61c4149995dcc4c986a28ab2b4f124.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h index d619e94..d84a01c 100644 --- a/src/declarative/fx/qfxwebview.h +++ b/src/declarative/fx/qfxwebview.h @@ -75,6 +75,8 @@ private: class QFxWebViewAttached; +class QFxWebSettings; + class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem { Q_OBJECT @@ -103,7 +105,7 @@ class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem Q_PROPERTY(QObject* forward READ forwardAction CONSTANT) Q_PROPERTY(QObject* stop READ stopAction CONSTANT) - Q_PROPERTY(QObject* settings READ settingsObject CONSTANT) + Q_PROPERTY(QFxWebSettings* settings READ settingsObject CONSTANT) Q_PROPERTY(QmlList<QObject *>* javaScriptWindowObjects READ javaScriptWindowObjects CONSTANT) @@ -157,7 +159,7 @@ public: QWebHistory *history() const; QWebSettings *settings() const; - QObject *settingsObject() const; + QFxWebSettings *settingsObject() const; QString status() const; |