diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-11-20 19:05:33 +0100 |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-11-20 19:10:14 +0100 |
| commit | 11769558f3f9107c45457ba7c735a1991e42f625 (patch) | |
| tree | ffd7057c77794364291a030aa73aa534fb0ea863 /src/protocolhandler.cpp | |
| parent | Remove the destructor of MainView (diff) | |
| parent | Fix markup: (diff) | |
| download | rekonq-11769558f3f9107c45457ba7c735a1991e42f625.tar.xz | |
Merge branch 'master' of git://git.kde.org/rekonq
Conflicts:
src/mainview.cpp
src/mainview.h
src/webtab.cpp
src/webtab.h
Diffstat (limited to 'src/protocolhandler.cpp')
| -rw-r--r-- | src/protocolhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp index a29ff366..00d97f54 100644 --- a/src/protocolhandler.cpp +++ b/src/protocolhandler.cpp @@ -271,7 +271,7 @@ void ProtocolHandler::showResults(const KFileItemList &list) _frame->setHtml(html); qobject_cast<WebPage *>(_frame->page())->setIsOnRekonqPage(true); - Application::instance()->mainWindow()->mainView()->urlBar()->setQUrl(_url); + Application::instance()->mainWindow()->mainView()->currentUrlBar()->setQUrl(_url); Application::instance()->mainWindow()->currentTab()->setFocus(); Application::historyManager()->addHistoryEntry(_url.prettyUrl()); } |