[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 097b4165e503dc44756f3159bb61f73dd55946a7
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 18:21:08 2009 +0000

    [Qt] Make QGLauncher's WebPage class constructor to get a QObject* as parent (not QWidget*).
    
    Patch by Antonio Gomes <tonikitoo at webkit.org> on 2009-10-15
    Rubberstamped by Tor Arne.
    
    * QGVLauncher/main.cpp:
    (WebPage::WebPage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49642 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a5c2430..b8efa78 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,14 @@
 2009-10-15  Antonio Gomes  <tonikitoo at webkit.org>
 
+        Rubberstamped by Tor Arne.
+
+        Make QGLauncher's WebPage class constructor to get a QObject* as parent (not QWidget*).
+
+        * QGVLauncher/main.cpp:
+        (WebPage::WebPage):
+
+2009-10-15  Antonio Gomes  <tonikitoo at webkit.org>
+
         Reviewed by Tor Arne.
 
         [Qt] QGLauncher crashes while closing a window
diff --git a/WebKit/qt/QGVLauncher/main.cpp b/WebKit/qt/QGVLauncher/main.cpp
index 1d67c35..d75ea75 100644
--- a/WebKit/qt/QGVLauncher/main.cpp
+++ b/WebKit/qt/QGVLauncher/main.cpp
@@ -54,7 +54,7 @@ class WebPage : public QWebPage {
     Q_OBJECT
 
 public:
-    WebPage(QWidget* parent = 0) : QWebPage(parent)
+    WebPage(QObject* parent = 0) : QWebPage(parent)
     {
         applyProxy();
     }

-- 
WebKit Debian packaging