[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
enrica at apple.com
enrica at apple.com
Wed Dec 22 13:45:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c47eaf4588799cf09f17ba841a88f48085633e13
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 25 03:05:59 2010 +0000
One more build fix.
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::setEditCommandState):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68324 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index af836db..2da8263 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-24 Enrica Casucci <enrica at apple.com>
+
+ One more build fix.
+
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPagePrivate::setEditCommandState):
+
2010-09-24 Sam Weinig <sam at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 0351516..a3af1e2 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -166,6 +166,10 @@ void QWKPagePrivate::wheelEvent(QGraphicsSceneWheelEvent* ev)
page->wheelEvent(wheelEvent);
}
+void QWKPagePrivate::setEditCommandState(const WTF::String&, bool, int)
+{
+}
+
void QWKPagePrivate::updateAction(QWKPage::WebAction action)
{
#ifdef QT_NO_ACTION
@@ -414,10 +418,6 @@ void QWKPage::setViewportSize(const QSize& size)
d->page->drawingArea()->setSize(IntSize(size));
}
-void QWKPage::setEditCommandState(const WTF::String&, bool, int)
-{
-}
-
#ifndef QT_NO_ACTION
void QWKPage::triggerAction(WebAction action, bool)
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list