[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 14:20:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 97442f7106a6bea223c082f84c463baf4fb878ec
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 6 21:08:20 2010 +0000
2010-10-06 Andras Becsi <abecsi at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Fix the build after API changes introduced in r69214.
* UIProcess/API/cpp/qt/WKStringQt.cpp:
(WKStringCreateWithQString):
* UIProcess/API/cpp/qt/WKURLQt.cpp:
(WKURLCreateWithQUrl):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69232 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index be819d3..596ca1f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-06 Andras Becsi <abecsi at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Fix the build after API changes introduced in r69214.
+
+ * UIProcess/API/cpp/qt/WKStringQt.cpp:
+ (WKStringCreateWithQString):
+ * UIProcess/API/cpp/qt/WKURLQt.cpp:
+ (WKURLCreateWithQUrl):
+
2010-10-06 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r69210.
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
index d53c41e..0f2c946 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
+++ b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
@@ -30,7 +30,7 @@ using namespace WebKit;
WKStringRef WKStringCreateWithQString(const QString& qString)
{
WTF::String string(qString);
- return toCopiedRef(string);
+ return toCopiedAPI(string);
}
QString WKStringCopyQString(WKStringRef stringRef)
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
index 7438bad..74eca86 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
+++ b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
@@ -30,7 +30,7 @@ using namespace WebKit;
WKURLRef WKURLCreateWithQUrl(const QUrl& qURL)
{
WTF::String urlString(qURL.toString());
- return toCopiedURLRef(urlString);
+ return toCopiedURLAPI(urlString);
}
QUrl WKURLCopyQUrl(WKURLRef urlRef)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list