diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-15 07:37:43 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-15 07:37:43 (GMT) |
| commit | 6100dd1ccda7fce60625e99ffb2a90dc62cb1486 (patch) | |
| tree | 7de5d72c227a163c3d042d8c04b8551176e4460a /src/imports/webkit/qdeclarativewebview_p.h | |
| parent | 7b7f3869b15cee6f6815e10d49dcb8209a415edd (diff) | |
| parent | 3a54e5ead647a318641d9a2bcf75eda4b8859d1b (diff) | |
| download | Qt-6100dd1ccda7fce60625e99ffb2a90dc62cb1486.zip Qt-6100dd1ccda7fce60625e99ffb2a90dc62cb1486.tar.gz Qt-6100dd1ccda7fce60625e99ffb2a90dc62cb1486.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
src/gui/painting/qpainter.cpp
Diffstat (limited to 'src/imports/webkit/qdeclarativewebview_p.h')
| -rw-r--r-- | src/imports/webkit/qdeclarativewebview_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/webkit/qdeclarativewebview_p.h b/src/imports/webkit/qdeclarativewebview_p.h index 87bd938..042237e 100644 --- a/src/imports/webkit/qdeclarativewebview_p.h +++ b/src/imports/webkit/qdeclarativewebview_p.h @@ -108,10 +108,12 @@ class QDeclarativeWebView : public QDeclarativeItem Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) +#ifndef QT_NO_ACTION Q_PROPERTY(QAction* reload READ reloadAction CONSTANT) Q_PROPERTY(QAction* back READ backAction CONSTANT) Q_PROPERTY(QAction* forward READ forwardAction CONSTANT) Q_PROPERTY(QAction* stop READ stopAction CONSTANT) +#endif Q_PROPERTY(QDeclarativeWebSettings* settings READ settingsObject CONSTANT) @@ -154,10 +156,12 @@ public: qreal progress() const; QString statusText() const; +#ifndef QT_NO_ACTION QAction *reloadAction() const; QAction *backAction() const; QAction *forwardAction() const; QAction *stopAction() const; +#endif QWebPage *page() const; void setPage(QWebPage *page); |