[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
vestbo at webkit.org
vestbo at webkit.org
Wed Apr 7 23:26:23 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 81e05e7561d7ee8bdc02c4f7a180a9e70d5b1356
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 9 12:29:24 2009 +0000
Make the QGraphicsWebView constructor explicit.
Patch by Simon Hausmann <hausmann at webkit.org> on 2009-11-04
Reviewed by Tor Arne Vestbø.
* Api/qgraphicswebview.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50645 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/qgraphicswebview.h b/WebKit/qt/Api/qgraphicswebview.h
index 1b990cf..4db8067 100644
--- a/WebKit/qt/Api/qgraphicswebview.h
+++ b/WebKit/qt/Api/qgraphicswebview.h
@@ -49,7 +49,7 @@ class QWEBKIT_EXPORT QGraphicsWebView : public QGraphicsWidget {
Q_PROPERTY(bool modified READ isModified)
public:
- QGraphicsWebView(QGraphicsItem* parent = 0);
+ explicit QGraphicsWebView(QGraphicsItem* parent = 0);
~QGraphicsWebView();
QWebPage* page() const;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a3b1396..0a2d219 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-04 Simon Hausmann <hausmann at webkit.org>
+
+ Reviewed by Tor Arne Vestbø.
+
+ Make the QGraphicsWebView constructor explicit.
+
+ * Api/qgraphicswebview.h:
+
2009-11-05 Shu Chang <Chang.Shu at nokia.com>
Reviewed by Tor Arne Vestbø.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list