summaryrefslogtreecommitdiffstats
path: root/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-04-01 10:27:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-08 14:00:06 +0200
commit84f31c11b77a62212451cb77adae63219e06de96 (patch)
tree97d252eee0ee8716d1a7165cd714b0d5b9552ebb /src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
parent3cb5203cb7a4bee9a867e8616c23ce635d6a8506 (diff)
Revert part of the RenderWidgetHostViewQtDelegate refactoring
This reverts parts of commit 9c198939be1ef064d1a2430a4b9991f2fe16f359. This does keeps the popup fixes and removes support for QWebEnginePage::setViewportSize and QWebEnginePage::render until we can evaluate the needs vs the cost of such feature. Change-Id: I1b55b751d463717b1462393ea8cd353422f8fdbb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quickwindow.h')
-rw-r--r--src/webengine/render_widget_host_view_qt_delegate_quickwindow.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
index 9b959f02b..6adac5e95 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
@@ -52,7 +52,7 @@
class RenderWidgetHostViewQtDelegateQuickWindow : public QQuickWindow , public RenderWidgetHostViewQtDelegate {
public:
- RenderWidgetHostViewQtDelegateQuickWindow(RenderWidgetHostViewQtDelegate *realDelegate, QQuickItem *parent);
+ RenderWidgetHostViewQtDelegateQuickWindow(RenderWidgetHostViewQtDelegate *realDelegate);
~RenderWidgetHostViewQtDelegateQuickWindow();
virtual void initAsChild(WebContentsAdapterClient* container) Q_DECL_OVERRIDE;
@@ -67,7 +67,7 @@ public:
virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE;
virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE;
virtual void resize(int width, int height) Q_DECL_OVERRIDE;
- virtual void move(const QPoint &) Q_DECL_OVERRIDE;
+ virtual void move(const QPoint &screenPos) Q_DECL_OVERRIDE;
virtual void inputMethodStateChanged(bool) Q_DECL_OVERRIDE {}
virtual bool supportsHardwareAcceleration() const Q_DECL_OVERRIDE
{
@@ -78,7 +78,6 @@ public:
private:
QScopedPointer<RenderWidgetHostViewQtDelegate> m_realDelegate;
- QQuickItem *m_parentView;
};
#endif // RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_QUICKWINDOW_H