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/application.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/application.cpp')
-rw-r--r-- | src/application.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/application.cpp b/src/application.cpp index 2efb62c0..95aa9cf0 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -439,7 +439,7 @@ void Application::loadResolvedUrl(ThreadWeaver::Job *job) void Application::newWindow() { loadUrl(KUrl("about:home"), Rekonq::NewWindow); - mainWindow()->mainView()->urlBar()->setFocus(); + mainWindow()->mainView()->currentUrlBar()->setFocus(); } |