[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 83aff094d9fc3cea4132f348675ea3b1342cac0c
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 28 10:23:17 2009 +0000

    Complementary fix to bug 30779.
    
    Patch by Antonio Gomes <tonikitoo at webkit.org> on 2009-10-27
    Reviewed by Holger Freyther.
    
    By mistake I used QWeakPointer's toStrongRef() method which docs
    explicitly say to not be used in this situation (when the tracked
    pointer is devired from QObject). Instead QWeakPointer's data()
    is recommended.
    
    * Api/qwebpage.cpp:
    (QWebPage::view):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 29b8b27..0b122b4 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -1686,7 +1686,7 @@ QWidget *QWebPage::view() const
 #if QT_VERSION < 0x040600
     return d->view;
 #else
-    return d->view.toStrongRef().data();
+    return d->view.data();
 #endif
 }
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3b6ebdc..11813d0 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-27  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Holger Freyther.
+
+        Complementary fix to bug 30779.
+
+        By mistake I used QWeakPointer's toStrongRef() method which docs
+        explicitly say to not be used in this situation (when the tracked
+        pointer is devired from QObject). Instead QWeakPointer's data()
+        is recommended.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::view):
+
 2009-10-27  Holger Hans Peter Freyther  <zecke at selfish.org>
 
         Reviewed by Simon Fraser.

-- 
WebKit Debian packaging