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

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6b3ae4986559252b605ac820caaff1c981d7cad9
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 19:47:26 2010 +0000

    [Qt] On Maemo5, a click/touch in the location bar (when unfocused)
    should result in all text selected.
    
    Reviewed by Ariya Hidayat.
    
    * QtLauncher/locationedit.cpp:
    (LocationEdit::focusInEvent):
    * QtLauncher/locationedit.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e9289a0..d1d046e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Ariya Hidayat.
 
+        [Qt] On Maemo5, a click/touch in the location bar (when unfocused)
+        should result in all text selected.
+
+        * QtLauncher/locationedit.cpp:
+        (LocationEdit::focusInEvent):
+        * QtLauncher/locationedit.h:
+
+2010-01-29  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
         [Qt] Show progress reaching 100% for loads.
 
         * QtLauncher/locationedit.cpp:
diff --git a/WebKitTools/QtLauncher/locationedit.cpp b/WebKitTools/QtLauncher/locationedit.cpp
index d67bd1e..a97f148 100644
--- a/WebKitTools/QtLauncher/locationedit.cpp
+++ b/WebKitTools/QtLauncher/locationedit.cpp
@@ -70,3 +70,11 @@ void LocationEdit::paintEvent(QPaintEvent* ev)
     if (m_progress == 100)
         m_clearTimer.start(100);
 }
+
+void LocationEdit::focusInEvent(QFocusEvent* ev)
+{
+    QLineEdit::focusInEvent(ev);
+#ifdef Q_WS_MAEMO_5
+    QTimer::singleShot(0, this, SLOT(selectAll()));
+#endif
+}
diff --git a/WebKitTools/QtLauncher/locationedit.h b/WebKitTools/QtLauncher/locationedit.h
index 9991954..e82920c 100644
--- a/WebKitTools/QtLauncher/locationedit.h
+++ b/WebKitTools/QtLauncher/locationedit.h
@@ -44,6 +44,7 @@ private slots:
 
 protected:
     virtual void paintEvent(QPaintEvent*);
+    virtual void focusInEvent(QFocusEvent*);
 
 private:
     int m_progress;

-- 
WebKit Debian packaging