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

[zecke at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 63ba21524d1c19275378090e7ec98d68f476e498
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 09:29:35 2009 +0000

    [Qt] Do not disable the inspector on show and hide
    
    https://bugs.webkit.org/show_bug.cgi?id=31851
    
    On Qt/X11 with some window managers the window will be
    hidden when switching windows. In this case all the results
    are gone when coming back to the window.
    
    Attempt to use the CloseEvent to figure out if the window
    was closed and withdrawn as this is more friendly to the
    user of the inspector client.
    
    * Api/qwebinspector.cpp:
    (QWebInspector::hideEvent):
    (QWebInspector::closeEvent):
    * Api/qwebinspector.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52144 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebinspector.cpp b/WebKit/qt/Api/qwebinspector.cpp
index f43cbbf..b2d7b28 100644
--- a/WebKit/qt/Api/qwebinspector.cpp
+++ b/WebKit/qt/Api/qwebinspector.cpp
@@ -159,6 +159,11 @@ void QWebInspector::showEvent(QShowEvent* event)
 /*! \reimp */
 void QWebInspector::hideEvent(QHideEvent* event)
 {
+}
+
+/*! \reimp */
+void QWebInspector::closeEvent(QCloseEvent* event)
+{
     if (d->page)
         d->page->d->inspectorController()->setWindowVisible(false);
 }
diff --git a/WebKit/qt/Api/qwebinspector.h b/WebKit/qt/Api/qwebinspector.h
index a5c1ed5..6cda479 100644
--- a/WebKit/qt/Api/qwebinspector.h
+++ b/WebKit/qt/Api/qwebinspector.h
@@ -43,6 +43,7 @@ protected:
     void resizeEvent(QResizeEvent* event);
     void showEvent(QShowEvent* event);
     void hideEvent(QHideEvent* event);
+    void closeEvent(QCloseEvent* event);
 
 private:
     QWebInspectorPrivate* d;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7546635..3d077f8 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,23 @@
+2009-11-24  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Do not disable the inspector on show and hide
+        https://bugs.webkit.org/show_bug.cgi?id=31851
+
+        On Qt/X11 with some window managers the window will be
+        hidden when switching windows. In this case all the results
+        are gone when coming back to the window.
+
+        Attempt to use the CloseEvent to figure out if the window
+        was closed and withdrawn as this is more friendly to the
+        user of the inspector client.
+
+        * Api/qwebinspector.cpp:
+        (QWebInspector::hideEvent):
+        (QWebInspector::closeEvent):
+        * Api/qwebinspector.h:
+
 2009-12-14  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.

-- 
WebKit Debian packaging