[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 14:41:34 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b0edae9af039a3498f1b9e014982cc9a4bb9ccd8
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 16 01:01:03 2010 +0000
Fix Qt build.
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::createPopupMenuProxy):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69902 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1eb76cc..61f13cf 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,12 @@
2010-10-15 Sam Weinig <sam at webkit.org>
+ Fix Qt build.
+
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPagePrivate::createPopupMenuProxy):
+
+2010-10-15 Sam Weinig <sam at webkit.org>
+
Reviewed by Anders Carlsson.
Popup widget support (<select>)
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index bb27e84..2b602cf 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -113,7 +113,7 @@ void QWKPagePrivate::didNotHandleKeyEvent(const NativeWebKeyboardEvent&)
{
}
-PassRefPtr<WebPopupMenuProxy> WebView::createPopupMenuProxy()
+PassRefPtr<WebPopupMenuProxy> QWKPagePrivate::createPopupMenuProxy()
{
return WebPopupMenuProxyQt::create();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list