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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit c6d99f0a15d173456a1f8adc202b259ffc7bad19
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 08:26:15 2010 +0000

    2010-09-14  Enrico Ros  <eros at codeaurora.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] Respect title attribute on option elements
            https://bugs.webkit.org/show_bug.cgi?id=45084
    
            Set the tooltip in the combo box model, so it's reflected in the view.
    
            * WebCoreSupport/QtFallbackWebPopup.cpp:
            (WebCore::QtFallbackWebPopup::populate):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67453 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 9ade3db..02b73fe 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-14  Enrico Ros  <eros at codeaurora.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Respect title attribute on option elements
+        https://bugs.webkit.org/show_bug.cgi?id=45084
+
+        Set the tooltip in the combo box model, so it's reflected in the view.
+
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::populate):
+
 2010-09-13  Daniel Bates  <dbates at rim.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=45732
diff --git a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
index 3b53476..3f69a47 100644
--- a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
+++ b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
@@ -232,6 +232,7 @@ void QtFallbackWebPopup::populate(const QWebSelectData& data)
         case QWebSelectData::Option:
             m_combo->insertItem(i, data.itemText(i));
             model->item(i)->setEnabled(data.itemIsEnabled(i));
+            model->item(i)->setToolTip(data.itemToolTip(i));
             if (data.itemIsSelected(i))
                 currentIndex = i;
             break;

-- 
WebKit Debian packaging