From 962d9dd1fc5fe530dc9a7e29c95a0a2c1e7aa885 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 20 Apr 2012 23:31:41 +0200
Subject: Clean up headers && fix compilation with (the upcoming) qt 4.8.2

Conflicts:

	src/adblock/adblockwidget.h
	src/application.h
	src/history/historymanager.h
	src/tabpreviewpopup.cpp

Backported from master branch
---
 src/iconmanager.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/iconmanager.cpp')

diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index 86fa5393..2876aa27 100644
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -30,8 +30,8 @@
 
 // Local Includes
 #include "application.h"
-#include "webicon.h"
 #include "icondownloader.h"
+#include "webicon.h"
 
 // KDE Includes
 #include <KIO/Job>
@@ -41,11 +41,11 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtCore/QDir>
+#include <QDir>
 
-#include <QtWebKit/QWebElement>
-#include <QtWebKit/QWebFrame>
-#include <QtWebKit/QWebSettings>
+#include <QWebElement>
+#include <QWebFrame>
+#include <QWebSettings>
 
 
 IconManager::IconManager(QObject *parent)
-- 
cgit v1.2.1