[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1ab558b91e8a7dc05a18943a0afad7dc6bac9cb1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 18:16:37 2011 +0000

    2011-01-05  Yi Shen  <yi.4.shen at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Sync qwebkitplatformplugin.h in the plugin example
            https://bugs.webkit.org/show_bug.cgi?id=51882
    
            Make examples/platformplugin/qwebkitplatformplugin.h exactly the same
            as the one in the Api folder.
    
            * examples/platformplugin/qwebkitplatformplugin.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75078 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 886d9ac..f0da3f0 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-05  Yi Shen  <yi.4.shen at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Sync qwebkitplatformplugin.h in the plugin example
+        https://bugs.webkit.org/show_bug.cgi?id=51882
+
+        Make examples/platformplugin/qwebkitplatformplugin.h exactly the same
+        as the one in the Api folder.
+
+        * examples/platformplugin/qwebkitplatformplugin.h:
+
 2011-01-04  Zhe Su  <suzhe at chromium.org>
 
         Reviewed by Kenneth Russell.
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

-- 
WebKit Debian packaging