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/history.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/history.cpp')
| -rw-r--r-- | src/history.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/history.cpp b/src/history.cpp index afcb477a..0e822142 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -36,9 +36,17 @@ #include <KStandardDirs> // Qt Includes -#include <QtCore> -#include <QtGui> -#include <QtWebKit> +#include <QtCore/QList> +#include <QtCore/QUrl> +#include <QtCore/QDate> +#include <QtCore/QDateTime> +#include <QtCore/QString> +#include <QtCore/QFile> +#include <QtCore/QDataStream> +#include <QtCore/QBuffer> + +#include <QtWebKit/QWebHistoryInterface> +#include <QtWebKit/QWebSettings> #include <QtAlgorithms> @@ -1457,3 +1465,4 @@ void HistoryTreeModel::sourceRowsRemoved(const QModelIndex &parent, int start, i endRemoveRows(); } } + |