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

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 132800b3ac2a5acbc3b22a310be570431a6c7685
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 01:38:03 2011 +0000

    2011-01-05  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Unreviewed build fix.
    
            [Qt] [Symbian] Fix building NPAPI support
    
            NPEvent is mapped to QAction on Symbian. QAction has no
            default constructor, so toNP() fails to build. Add a case for
            Symbian behind the OS(SYMBIAN) guard.
    
            * WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp:
            (WebKit::toNP):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c82ee2a..11f01c7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-05  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Unreviewed build fix.
+
+        [Qt] [Symbian] Fix building NPAPI support
+
+        NPEvent is mapped to QAction on Symbian. QAction has no
+        default constructor, so toNP() fails to build. Add a case for
+        Symbian behind the OS(SYMBIAN) guard.
+
+        * WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp:
+        (WebKit::toNP):
+
 2011-01-05  Jeff Miller  <jeffm at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp b/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp
index 89e6c9e..77efc01 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp
@@ -63,7 +63,11 @@ void NetscapePlugin::platformPaint(GraphicsContext* context, const IntRect& dirt
 
 NPEvent toNP(const WebMouseEvent& event)
 {
+#if OS(SYMBIAN)
+    NPEvent npEvent = QEvent(QEvent::None);
+#else
     NPEvent npEvent = NPEvent();
+#endif
 
     notImplemented();
 

-- 
WebKit Debian packaging