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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 16:28:51 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 96722b1e192e2a7d5d9e317831b53435555520c2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 24 15:49:03 2010 +0000

    2010-11-24  Yi Shen  <yi.4.shen at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Make QtTestBrowser remember the selected user agent
            https://bugs.webkit.org/show_bug.cgi?id=50021
    
            Set user agent for a new page by using the old page's
    
            * QtTestBrowser/mainwindow.cpp:
            (MainWindow::setPage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72671 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 50e6938..43f50df 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-24  Yi Shen  <yi.4.shen at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Make QtTestBrowser remember the selected user agent
+        https://bugs.webkit.org/show_bug.cgi?id=50021
+
+        Set user agent for a new page by using the old page's
+
+        * QtTestBrowser/mainwindow.cpp:
+        (MainWindow::setPage):
+
 2010-11-24 Patrick Gansterer <paroga at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/WebKitTools/QtTestBrowser/mainwindow.cpp b/WebKitTools/QtTestBrowser/mainwindow.cpp
index 9854c4f..f361fa8 100644
--- a/WebKitTools/QtTestBrowser/mainwindow.cpp
+++ b/WebKitTools/QtTestBrowser/mainwindow.cpp
@@ -103,6 +103,9 @@ void MainWindow::buildUI()
 
 void MainWindow::setPage(WebPage* page)
 {
+    if (page && m_page)
+        page->setUserAgent(m_page->userAgentForUrl(QUrl()));
+
     delete m_page;
     m_page = page;
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list