[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

eric at webkit.org eric at webkit.org
Thu Feb 4 21:36:51 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 3d0aeade29935eb1f4293ca84d73a9fd4d2e6909
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 15:29:32 2010 +0000

    2010-02-02  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] Symbian plugins include a wrong header file for QPixmap
            https://bugs.webkit.org/show_bug.cgi?id=34475
    
            * plugins/symbian/PluginViewSymbian.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54235 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a4b6454..abdbb58 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-02  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Symbian plugins include a wrong header file for QPixmap
+        https://bugs.webkit.org/show_bug.cgi?id=34475
+
+        * plugins/symbian/PluginViewSymbian.cpp:
+
 2010-02-02  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/plugins/symbian/PluginViewSymbian.cpp b/WebCore/plugins/symbian/PluginViewSymbian.cpp
index 4a93e45..3492868 100644
--- a/WebCore/plugins/symbian/PluginViewSymbian.cpp
+++ b/WebCore/plugins/symbian/PluginViewSymbian.cpp
@@ -54,7 +54,7 @@
 #include "npruntime_impl.h"
 #include "runtime_root.h"
 #include <QKeyEvent>
-#include <QPixmap.h>
+#include <QPixmap>
 #include <QRegion>
 #include <QVector>
 #include <QWidget>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list