summaryrefslogtreecommitdiffstats
path: root/Tools/QtTestBrowser/locationedit.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-25 19:08:45 +0100
committerSteve Block <steveblock@google.com>2011-06-08 13:51:31 +0100
commit2bde8e466a4451c7319e3a072d118917957d6554 (patch)
tree28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Tools/QtTestBrowser/locationedit.h
parent6939c99b71d9372d14a0c74a772108052e8c48c8 (diff)
downloadexternal_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip
external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz
external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Tools/QtTestBrowser/locationedit.h')
-rw-r--r--Tools/QtTestBrowser/locationedit.h6
1 files changed, 6 insertions, 0 deletions
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