summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-04-07 01:18:16 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-04-07 01:18:16 +0200
commitdab765fa8b1ad4ed4c2919a9ff2d6eb863565ae7 (patch)
tree6a6b1cba3c1b471e2839568cf9f23a8f0afe6f5c
parentMerge commit 'refs/merge-requests/115' of git://gitorious.org/rekonq/mainline... (diff)
parentLoad the url when an url is dropped onto the urlbar (diff)
downloadrekonq-dab765fa8b1ad4ed4c2919a9ff2d6eb863565ae7.tar.xz
Merge commit 'refs/merge-requests/116' of git://gitorious.org/rekonq/mainline into m116
-rw-r--r--src/urlbar/urlbar.cpp7
-rw-r--r--src/urlbar/urlbar.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index dd14a4a3..35934bf4 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -269,3 +269,10 @@ void UrlBar::setTrustedHost(bool on)
kDebug() << "SET TRUSTED HOST..";
iconButton()->setIconUrl( _tab->url() , on );
}
+
+
+void UrlBar::dropEvent(QDropEvent *event)
+{
+ LineEdit::dropEvent(event);
+ activated(text());
+}
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 848073db..3b28fb3a 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -72,6 +72,7 @@ protected:
virtual void paintEvent(QPaintEvent *event);
virtual void keyPressEvent(QKeyEvent *event);
virtual void focusInEvent(QFocusEvent *event);
+ virtual void dropEvent(QDropEvent *event);
private:
CompletionWidget *_box;