[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0d1ef97c62ca9e91c2fe1e599869dc08657ecdb0
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 17:06:01 2010 +0000

    2010-01-29  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Disable the QtLauncher statusbar on Maemo
    
            https://bugs.webkit.org/show_bug.cgi?id=34330
    
            * QtLauncher/main.cpp:
            (LauncherWindow::showLinkHover):
            (LauncherWindow::selectElements):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54066 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a81861c..2e2d0ad 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [Qt] Disable the QtLauncher statusbar on Maemo
+
+        https://bugs.webkit.org/show_bug.cgi?id=34330
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::showLinkHover):
+        (LauncherWindow::selectElements):
+
+2010-01-29  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [Qt] Display page loading progress inside the QtLauncher location bar
 
         https://bugs.webkit.org/show_bug.cgi?id=34210
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index 9a71c11..1b77b34 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -264,7 +264,9 @@ protected slots:
 
     void showLinkHover(const QString &link, const QString &toolTip)
     {
+#ifndef Q_WS_MAEMO_5
         statusBar()->showMessage(link);
+#endif
 #ifndef QT_NO_TOOLTIP
         if (!toolTip.isEmpty())
             QToolTip::showText(QCursor::pos(), toolTip);
@@ -361,7 +363,9 @@ protected slots:
             QWebElementCollection result =  page()->mainFrame()->findAllElements(str);
             foreach (QWebElement e, result)
                 e.setStyleProperty("background-color", "yellow");
+#ifndef Q_WS_MAEMO_5
             statusBar()->showMessage(QString("%1 element(s) selected").arg(result.count()), 5000);
+#endif
         }
     }
 

-- 
WebKit Debian packaging