[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Sun Feb 20 22:57:48 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit c1c9e89d427e787fb86c79bb30c6480c77e550a4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 14 18:30:16 2011 +0000
2011-01-14 Viatcheslav Ostapenko <ostapenko.viatcheslav at nokia.com>
Reviewed by Eric Seidel.
[Qt] Fix build problem introduced by http://trac.webkit.org/changeset/75713
https://bugs.webkit.org/show_bug.cgi?id=30179
* plugins/symbian/PluginViewSymbian.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75801 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 0a69a74..abffeb6 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-14 Viatcheslav Ostapenko <ostapenko.viatcheslav at nokia.com>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] Fix build problem introduced by http://trac.webkit.org/changeset/75713
+ https://bugs.webkit.org/show_bug.cgi?id=30179
+
+ * plugins/symbian/PluginViewSymbian.cpp:
+
2011-01-14 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Martin Robinson.
diff --git a/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp b/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp
index 1e5b26f..f3eb033 100644
--- a/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp
+++ b/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp
@@ -66,7 +66,7 @@
#include <runtime/JSValue.h>
typedef void (*_qtwebkit_page_plugin_created)(QWebFrame*, void*, void*); // frame, plugin instance, plugin functions
-static _qtwebkit_page_plugin_created qt_page_plugin_created = 0;
+static _qtwebkit_page_plugin_created qtwebkit_page_plugin_created = 0;
QWEBKIT_EXPORT void qtwebkit_setPluginCreatedCallback(_qtwebkit_page_plugin_created cb)
{
qtwebkit_page_plugin_created = cb;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list