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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 88b711812cfcb2dbaee612c17c73dcb7f709666b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 18:55:01 2010 +0000

    2010-11-09  Yi Shen  <yi.4.shen at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt][QtTestBrowser] Don't erase incorrect url in the Url Bar
            https://bugs.webkit.org/show_bug.cgi?id=49047
    
            * QtTestBrowser/mainwindow.cpp:
            (MainWindow::setAddressUrl):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 252834f..92526a8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-09  Yi Shen  <yi.4.shen at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][QtTestBrowser] Don't erase incorrect url in the Url Bar
+        https://bugs.webkit.org/show_bug.cgi?id=49047
+
+        * QtTestBrowser/mainwindow.cpp:
+        (MainWindow::setAddressUrl):
+
 2010-11-09  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/WebKitTools/QtTestBrowser/mainwindow.cpp b/WebKitTools/QtTestBrowser/mainwindow.cpp
index 68002e1..9854c4f 100644
--- a/WebKitTools/QtTestBrowser/mainwindow.cpp
+++ b/WebKitTools/QtTestBrowser/mainwindow.cpp
@@ -116,12 +116,13 @@ WebPage* MainWindow::page() const
 
 void MainWindow::setAddressUrl(const QUrl& url)
 {
-    urlEdit->setText(url.toString(QUrl::RemoveUserInfo));
+    setAddressUrl(url.toString(QUrl::RemoveUserInfo));
 }
 
 void MainWindow::setAddressUrl(const QString& url)
 {
-    urlEdit->setText(url);
+    if (!url.contains("about:"))
+        urlEdit->setText(url);
 }
 
 void MainWindow::addCompleterEntry(const QUrl& url)

-- 
WebKit Debian packaging