diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-02 08:54:43 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-02 08:54:43 (GMT) |
| commit | 5247ee562f76a51b8a81735d7da709d1b9b63796 (patch) | |
| tree | bbe2b7e2b538082ee158ccef7e8f7d1020798e47 /src/declarative/graphicsitems/qmlgraphicswebview_p.h | |
| parent | bd22fbc0447faa58f3a4ab52ed5545f12a47cd5c (diff) | |
| parent | b1ca4dbd2935cb2647aa1650a5185cb918ecb21d (diff) | |
| download | Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.zip Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.tar.gz Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicswebview_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicswebview_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h index 7ff51f3..2280697 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h @@ -44,7 +44,7 @@ #include <QtGui/QAction> #include <QtCore/QUrl> -#include <private/qmlgraphicspainteditem_p.h> +#include "qmlgraphicspainteditem_p.h" #include <QtNetwork/qnetworkaccessmanager.h> #include <QtWebKit/QWebPage> @@ -210,7 +210,7 @@ private Q_SLOTS: void setStatusText(const QString&); void windowObjectCleared(); void pageUrlChanged(); - void contentsSizeChanged(const QSize&); + void noteContentsSizeChanged(const QSize&); void initialLayout(); protected: @@ -235,6 +235,8 @@ private: virtual void componentComplete(); Q_DISABLE_COPY(QmlGraphicsWebView) Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsWebView) + QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *); + QMouseEvent *sceneHoverMoveEventToMouseEvent(QGraphicsSceneHoverEvent *); friend class QmlGraphicsWebPage; }; |