[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
weinig at apple.com
weinig at apple.com
Wed Dec 22 17:56:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 77d95d6ccf10dfaee2ab740dc37ae8c57c014444
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 3 00:33:46 2010 +0000
Fix Qt.
* UIProcess/API/qt/qwkpreferences.cpp:
(QWKPreferencesPrivate::createPreferences):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73216 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0457e64..92e2de1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,12 @@
2010-12-02 Sam Weinig <sam at webkit.org>
+ Fix Qt.
+
+ * UIProcess/API/qt/qwkpreferences.cpp:
+ (QWKPreferencesPrivate::createPreferences):
+
+2010-12-02 Sam Weinig <sam at webkit.org>
+
Reviewed by Anders Carlsson.
WebKit2 Preferences should be held off the PageGroup, not the Context
diff --git a/WebKit2/UIProcess/API/qt/qwkpreferences.cpp b/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
index a4c942b..d558078 100644
--- a/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpreferences.cpp
@@ -29,7 +29,7 @@
QWKPreferences* QWKPreferencesPrivate::createPreferences(WKPageGroupRef pageGroupRef)
{
QWKPreferences* prefs = new QWKPreferences;
- prefs->d->ref = WKContextGetPreferences(pageGroupRef);
+ prefs->d->ref = WKPageGroupGetPreferences(pageGroupRef);
return prefs;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list