From 0e33f73fbff89fa8b5d0b3336e4642559ac153d3 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Wed, 31 Oct 2012 18:44:24 +0000
Subject: Fixed compilation with recent qt5 snapshots:  * QWebKit has been
 renamed to QWebKitWidgets  * QCleanlooksStyle is not included by default, use
 QFusionStyle instead This breaks compatibility with qt5-beta1, but beta2
 should be right around the corner

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6280 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/kvirc/kernel/KviApplication.cpp    | 11 ++++++++++-
 src/modules/help/HelpWidget.cpp        |  1 -
 src/modules/help/HelpWidget.h          | 14 +++++++++-----
 src/modules/help/HelpWindow.h          |  8 ++++++--
 src/modules/objects/KvsObject_widget.h |  6 +++++-
 5 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index 56a3e603d..e00dfc338 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -105,7 +105,12 @@
 #include <QMessageBox>
 #include <QTextCodec>
 #include <QMetaObject>
-#include <QCleanlooksStyle>
+
+#if (QT_VERSION < 0x050000)
+	#include <QCleanlooksStyle>
+#else
+	#include <QFusionStyle>
+#endif
 
 #ifdef COMPILE_ON_WINDOWS
 	#include <QPluginLoader>
@@ -229,7 +234,11 @@ KviApplication::KviApplication(int &argc,char ** argv)
 	// workaround for gtk+ style forcing a crappy white background (ticket #777, #964, #1009, ..)
 	if(QString("QGtkStyle").compare(qApp->style()->metaObject()->className())==0)
 	{
+#if (QT_VERSION < 0x050000)
 		setStyle(new QCleanlooksStyle());
+#else
+		setStyle(new QFusionStyle());
+#endif
 		setPalette(style()->standardPalette());
 	}
 #endif
diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp
index cf809ed21..44be162fe 100644
--- a/src/modules/help/HelpWidget.cpp
+++ b/src/modules/help/HelpWidget.cpp
@@ -45,7 +45,6 @@ extern KviPointerList<HelpWindow> * g_pHelpWindowList;
 extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-#include <QtWebKit/QWebView>
 #include <QShortcut>
 
 #define HIGHLIGHT_FLAGS QWebPage::HighlightAllOccurrences
diff --git a/src/modules/help/HelpWidget.h b/src/modules/help/HelpWidget.h
index 748a9d6e9..43d8e8ccc 100644
--- a/src/modules/help/HelpWidget.h
+++ b/src/modules/help/HelpWidget.h
@@ -28,12 +28,16 @@
 #include "kvi_settings.h"
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-#include <QtWebKit/QWebView>
-#include <QToolBar>
-#include <QVBoxLayout>
+	#if (QT_VERSION < 0x050000)
+		#include <QtWebKit/QWebView>
+	#else
+		#include <QtWebKitWidgets/QWebView>
+	#endif
+	#include <QToolBar>
+	#include <QVBoxLayout>
 #else
-#include "KviTalHBox.h"
-#include <QTextBrowser>
+	#include "KviTalHBox.h"
+	#include <QTextBrowser>
 #endif
 #include <QProgressBar>
 
diff --git a/src/modules/help/HelpWindow.h b/src/modules/help/HelpWindow.h
index cb7d4c62e..29e6a3dea 100644
--- a/src/modules/help/HelpWindow.h
+++ b/src/modules/help/HelpWindow.h
@@ -32,9 +32,13 @@
 
 #include <QTabWidget>
 #ifdef COMPILE_WEBKIT_SUPPORT
-#include <QtWebKit/QWebView>
+	#if (QT_VERSION < 0x050000)
+		#include <QtWebKit/QWebView>
+	#else
+		#include <QtWebKitWidgets/QWebView>
+	#endif
 #else
-class QTextBrowser;
+	class QTextBrowser;
 #endif
 
 #include <QLineEdit>
diff --git a/src/modules/objects/KvsObject_widget.h b/src/modules/objects/KvsObject_widget.h
index 22ac4bb2b..3507a3fdb 100644
--- a/src/modules/objects/KvsObject_widget.h
+++ b/src/modules/objects/KvsObject_widget.h
@@ -33,7 +33,11 @@
 #include <QGraphicsEffect>
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-	#include <QtWebKit/QWebView>
+	#if (QT_VERSION < 0x050000)
+		#include <QtWebKit/QWebView>
+	#else
+		#include <QtWebKitWidgets/QWebView>
+	#endif
 #endif
 
 class KvsObject_widget : public KviKvsObject
-- 
cgit v1.3.1-10-gc9f91