[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit ea3a0469f5e001605a5a3bb71f3748bd5b52561d
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 30 14:48:05 2010 +0000

    2010-10-30  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] QtTestBrowser: Switching view type moves the embedded inspector
            https://bugs.webkit.org/show_bug.cgi?id=48705
    
            Reinsert the embedded inspector into the splitter after changing
            between QWebView/QGraphicsWebView.
    
            * QtTestBrowser/launcherwindow.cpp:
            (LauncherWindow::init):
            (LauncherWindow::initializeView):
            * QtTestBrowser/webinspector.h:
            (WebInspector::WebInspector):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70980 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6259145..7f045ad 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-30  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] QtTestBrowser: Switching view type moves the embedded inspector
+        https://bugs.webkit.org/show_bug.cgi?id=48705
+
+        Reinsert the embedded inspector into the splitter after changing
+        between QWebView/QGraphicsWebView.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::init):
+        (LauncherWindow::initializeView):
+        * QtTestBrowser/webinspector.h:
+        (WebInspector::WebInspector):
+
 2010-10-28  Antonio Gomes  <agomes at rim.com>
 
         Reviewed by Ojan Vafai.
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index e5e49be..7608063 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -70,12 +70,11 @@ void LauncherWindow::init()
     resize(800, 600);
 #endif
 
-    m_inspector = new WebInspector(splitter);
+    m_inspector = new WebInspector;
 #ifndef QT_NO_PROPERTIES
     if (!m_windowOptions.inspectorUrl.isEmpty())
         m_inspector->setProperty("_q_inspectorUrl", m_windowOptions.inspectorUrl);
 #endif
-    m_inspector->hide();
     connect(this, SIGNAL(destroyed()), m_inspector, SLOT(deleteLater()));
 
     // the zoom values are chosen to be like in Mozilla Firefox 3
@@ -130,6 +129,7 @@ void LauncherWindow::initializeView()
 
     applyPrefs();
 
+    splitter->addWidget(m_inspector);
     m_inspector->setPage(page());
     m_inspector->hide();
 
diff --git a/WebKitTools/QtTestBrowser/webinspector.h b/WebKitTools/QtTestBrowser/webinspector.h
index d251c5c..5cc7f8a 100644
--- a/WebKitTools/QtTestBrowser/webinspector.h
+++ b/WebKitTools/QtTestBrowser/webinspector.h
@@ -35,7 +35,7 @@ class WebInspector : public QWebInspector {
     Q_OBJECT
 
 public:
-    WebInspector(QWidget* parent) : QWebInspector(parent) {}
+    WebInspector(QWidget* parent = 0) : QWebInspector(parent) {}
 
 signals:
     void visibleChanged(bool nowVisible);

-- 
WebKit Debian packaging