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.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/iconmanager.h')

diff --git a/src/iconmanager.h b/src/iconmanager.h
index 4f4b9871..f5416a95 100644
--- a/src/iconmanager.h
+++ b/src/iconmanager.h
@@ -31,7 +31,8 @@
 #include "rekonq_defines.h"
 
 // Qt Includes
-#include <QtCore/QObject>
+#include <QObject>
+#include <QString>
 
 // Forward Declarations
 class KIcon;
-- 
cgit v1.2.1