From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h') diff --git a/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h b/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h index caf8e0d..03fc722 100644 --- a/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h +++ b/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h @@ -68,6 +68,7 @@ public Q_SLOTS: void forward(); void reload(); void stop(); + void showContextMenu(QSharedPointer); protected: virtual void keyPressEvent(QKeyEvent*); @@ -88,9 +89,6 @@ protected: virtual void focusInEvent(QFocusEvent*); virtual void focusOutEvent(QFocusEvent*); -private Q_SLOTS: - void showContextMenu(QMenu*); - private: Q_PRIVATE_SLOT(d, void onScaleChanged()); -- cgit v1.1