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

[zoltan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fa98df7ae04eb7111b9ab0f9b2050c20b13d89e6
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 13:50:25 2010 +0000

    2010-09-09  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] Modify load method of MiniBrowser's BrowserView class
            https://bugs.webkit.org/show_bug.cgi?id=45442
    
            Modify load method to take a QString as argument, remove unnecessary QT_VERSION_CHECK.
    
            * MiniBrowser/qt/BrowserView.cpp:
            (BrowserView::load):
            * MiniBrowser/qt/BrowserView.h:
            * MiniBrowser/qt/BrowserWindow.cpp:
            (BrowserWindow::load):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67082 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 00c34b3..e232ce6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-09  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Modify load method of MiniBrowser's BrowserView class
+        https://bugs.webkit.org/show_bug.cgi?id=45442
+
+        Modify load method to take a QString as argument, remove unnecessary QT_VERSION_CHECK.
+
+        * MiniBrowser/qt/BrowserView.cpp:
+        (BrowserView::load):
+        * MiniBrowser/qt/BrowserView.h:
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::load):
+
 2010-09-09  Tony Chang  <tony at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/WebKitTools/MiniBrowser/qt/BrowserView.cpp b/WebKitTools/MiniBrowser/qt/BrowserView.cpp
index 31463ae..a5e06ec 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserView.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserView.cpp
@@ -64,13 +64,9 @@ void BrowserView::resizeEvent(QResizeEvent* event)
     scene()->setSceneRect(rect);
 }
 
-void BrowserView::load(const QUrl& url)
+void BrowserView::load(const QString& url)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-    return m_item->load(QUrl::fromUserInput(url.toString()));
-#else
-    return m_item->load(url);
-#endif
+    return m_item->load(QUrl::fromUserInput(url));
 }
 
 QGraphicsWKView* BrowserView::view() const
diff --git a/WebKitTools/MiniBrowser/qt/BrowserView.h b/WebKitTools/MiniBrowser/qt/BrowserView.h
index e265959..42b7658 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserView.h
+++ b/WebKitTools/MiniBrowser/qt/BrowserView.h
@@ -40,7 +40,7 @@ public:
     BrowserView(QWidget* parent = 0);
     virtual ~BrowserView() { delete m_item; }
 
-    void load(const QUrl&);
+    void load(const QString&);
     QGraphicsWKView* view() const;
 
 protected:
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
index 08f0155..d820ff6 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
@@ -64,7 +64,7 @@ BrowserWindow::BrowserWindow()
 void BrowserWindow::load(const QString& url)
 {
     m_addressBar->setText(url);
-    m_browser->load(QUrl(url));
+    m_browser->load(url);
 }
 
 BrowserWindow* BrowserWindow::newWindow(const QString& url)

-- 
WebKit Debian packaging