[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hausmann at webkit.org
hausmann at webkit.org
Wed Dec 22 16:25:32 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 15224b215b19435845062f620140b15d890de71e
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 23 14:52:22 2010 +0000
[Qt] Restore binary compatibility with the QtWebKit 2.1 branch
Reviewed by Andreas Kling.
Re-order the enums by adding new enum entries to the end.
* Api/qwebsettings.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72604 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index 7dad72f..0569ab0 100644
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -75,9 +75,9 @@ public:
TiledBackingStoreEnabled,
FrameFlatteningEnabled,
SiteSpecificQuirksEnabled,
+ JavascriptCanCloseWindows,
WebGLEnabled,
- HyperlinkAuditingEnabled,
- JavascriptCanCloseWindows
+ HyperlinkAuditingEnabled
};
enum WebGraphic {
MissingImageGraphic,
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 38f02c5..3196af0 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,15 @@
2010-11-23 Simon Hausmann <simon.hausmann at nokia.com>
+ Reviewed by Andreas Kling.
+
+ [Qt] Restore binary compatibility with the QtWebKit 2.1 branch
+
+ Re-order the enums by adding new enum entries to the end.
+
+ * Api/qwebsettings.h:
+
+2010-11-23 Simon Hausmann <simon.hausmann at nokia.com>
+
Reviewed by Tor Arne Vestbø.
[Qt] Review the setUserPermission & friends API
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list