[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 11:31:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c3a0719ea58e699c03116caae7034b90b984bc71
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 28 09:50:58 2010 +0000
2010-07-28 Andras Becsi <abecsi at webkit.org>
Unreviewed trivial build fix.
[Qt] Follow the API changes after r64172.
* UIProcess/API/qt/qwkpage.cpp:
(QWKPage::url):
(QWKPage::title):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64193 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 90f74e6..aa5aec0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-28 Andras Becsi <abecsi at webkit.org>
+
+ Unreviewed trivial build fix.
+
+ [Qt] Follow the API changes after r64172.
+
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPage::url):
+ (QWKPage::title):
+
2010-07-27 Anders Carlsson <andersca at apple.com>
Fix Windows build.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index ebfd795..5c3c6d5 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -291,12 +291,12 @@ QUrl QWKPage::url() const
WKRetainPtr<WKFrameRef> frame = WKPageGetMainFrame(pageRef());
if (!frame)
return QUrl();
- return WKURLCopyQUrl(WKFrameGetURL(frame.get()));
+ return WKURLCopyQUrl(WKFrameCopyURL(frame.get()));
}
QString QWKPage::title() const
{
- return WKStringCopyQString(WKPageGetTitle(pageRef()));
+ return WKStringCopyQString(WKPageCopyTitle(pageRef()));
}
void QWKPage::setViewportSize(const QSize& size)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list