From cad810f21b803229eb11403f9209855525a25d57 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 6 May 2011 11:45:16 +0100
Subject: Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
---
 WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'WebKit/qt/examples/platformplugin')

diff --git a/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h b/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
index f38a8fb..b8cc984 100644
--- a/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
+++ b/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
@@ -84,9 +84,13 @@ Q_SIGNALS:
     void notificationClicked();
 };
 
-class QWebHapticFeedbackPlayer
+class QWebHapticFeedbackPlayer: public QObject
 {
+    Q_OBJECT
 public:
+    QWebHapticFeedbackPlayer() {}
+    virtual ~QWebHapticFeedbackPlayer() {}
+
     enum HapticStrength {
         None, Weak, Medium, Strong
     };
@@ -127,6 +131,8 @@ public:
     virtual QObject* createExtension(Extension extension) const = 0;
 };
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.6");
+QT_END_NAMESPACE
 
 #endif // QWEBKITPLATFORMPLUGIN_H
-- 
cgit v1.1