From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 25 May 2011 19:08:45 +0100
Subject: Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
---
 Tools/QtTestBrowser/locationedit.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Tools/QtTestBrowser/locationedit.h')

diff --git a/Tools/QtTestBrowser/locationedit.h b/Tools/QtTestBrowser/locationedit.h
index 962b422..e8afe70 100644
--- a/Tools/QtTestBrowser/locationedit.h
+++ b/Tools/QtTestBrowser/locationedit.h
@@ -39,6 +39,8 @@ class LocationEdit : public QLineEdit {
 public:
     LocationEdit(QWidget* parent = 0);
 
+    void setPageIcon(const QIcon&);
+
 public slots:
     void setProgress(int progress);
 
@@ -48,10 +50,14 @@ private slots:
 protected:
     virtual void paintEvent(QPaintEvent*);
     virtual void focusInEvent(QFocusEvent*);
+    virtual void resizeEvent(QResizeEvent*);
 
 private:
+    void updateInternalGeometry();
+
     int m_progress;
     QTimer m_clearTimer;
+    QLabel* m_pageIconLabel;
 };
 
 #endif
-- 
cgit v1.1