diff options
| author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
|---|---|---|
| committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
| commit | 601ebdf6c4faea76016cf0d87d50abc260ca1569 (patch) | |
| tree | cf601630c933447f2a369f6245f9a04b9a46b08a /src/application.cpp | |
| parent | Typographical and grammar corrections (diff) | |
| parent | EBN Krazy fixes. 1st round.. (diff) | |
| download | rekonq-601ebdf6c4faea76016cf0d87d50abc260ca1569.tar.xz | |
Fixing conflicts merging master
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/application.cpp')
| -rw-r--r-- | src/application.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/application.cpp b/src/application.cpp index ec24691e..5f7892c4 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -45,8 +45,9 @@ #include <kio/jobclasses.h> // Qt Includes -#include <QtCore> -#include <QtWebKit> +#include <QtCore/QTimer> +#include <QtWebKit/QWebSettings> +#include <QtWebKit/QWebHistoryInterface> QPointer<HistoryManager> Application::s_historyManager; @@ -204,3 +205,4 @@ KIcon Application::icon(const KUrl &url) const } return icon; } + |