6 files changed, 23 insertions, 3 deletions
diff --git a/WebKitTools/QtTestBrowser/QtTestBrowser.pro b/WebKitTools/QtTestBrowser/QtTestBrowser.pro
index 08e0fb8..62d2c02 100644
--- a/WebKitTools/QtTestBrowser/QtTestBrowser.pro
+++ b/WebKitTools/QtTestBrowser/QtTestBrowser.pro
@@ -49,6 +49,7 @@ linux-* {
 symbian {
     TARGET.UID3 = 0xA000E543
     TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices Location
+    MMP_RULES *= pageddata
 }
 
 contains(QT_CONFIG, opengl) {
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/useragentlist.txt b/WebKitTools/QtTestBrowser/useragentlist.txt
index b4b00f6..1c424d9 100644
--- a/WebKitTools/QtTestBrowser/useragentlist.txt
+++ b/WebKitTools/QtTestBrowser/useragentlist.txt
@@ -3,6 +3,7 @@ Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0; en-GB) AppleWebKit/533.3 (KHTML, li
 Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8
 Mozilla/5.0 (Linux; U; Android 1.1; en-gb; dream) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2
 Mozilla/5.0 (iPhone; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10
+Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
 Mozilla/5.0(iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10
 Opera/9.25 (Windows NT 6.0; U; en)
 Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0 Nokia5800d-1b/20.2.014; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413
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);
diff --git a/WebKitTools/QtTestBrowser/webview.cpp b/WebKitTools/QtTestBrowser/webview.cpp
index 242daf6..fffaf9c 100644
--- a/WebKitTools/QtTestBrowser/webview.cpp
+++ b/WebKitTools/QtTestBrowser/webview.cpp
@@ -59,9 +59,26 @@ WebViewGraphicsBased::WebViewGraphicsBased(QWidget* parent)
 void WebViewGraphicsBased::setPage(QWebPage* page)
 {
     connect(page->mainFrame(), SIGNAL(contentsSizeChanged(const QSize&)), SLOT(contentsSizeChanged(const QSize&)));
+    connect(page, SIGNAL(scrollRequested(int, int, const QRect&)), SLOT(scrollRequested(int, int)));
     graphicsWebView()->setPage(page);
 }
 
+void WebViewGraphicsBased::scrollRequested(int x, int y)
+{
+    if (!m_resizesToContents)
+        return;
+
+    // Turn off interactive mode while scrolling, or QGraphicsView will replay the
+    // last mouse event which may cause WebKit to initiate a drag operation.
+    bool interactive = isInteractive();
+    setInteractive(false);
+
+    verticalScrollBar()->setValue(-y);
+    horizontalScrollBar()->setValue(-x);
+
+    setInteractive(interactive);
+}
+
 void WebViewGraphicsBased::contentsSizeChanged(const QSize& size)
 {
     if (m_resizesToContents)
diff --git a/WebKitTools/QtTestBrowser/webview.h b/WebKitTools/QtTestBrowser/webview.h
index e34d081..240ea89 100644
--- a/WebKitTools/QtTestBrowser/webview.h
+++ b/WebKitTools/QtTestBrowser/webview.h
@@ -97,6 +97,7 @@ public slots:
     void animatedFlip();
     void animatedYFlip();
     void contentsSizeChanged(const QSize&);
+    void scrollRequested(int, int);
 
 signals:
     void currentFPSUpdated(int fps);