diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviApplication.cpp | 11 | ||||
| -rw-r--r-- | src/modules/help/HelpWidget.cpp | 1 | ||||
| -rw-r--r-- | src/modules/help/HelpWidget.h | 14 | ||||
| -rw-r--r-- | src/modules/help/HelpWindow.h | 8 | ||||
| -rw-r--r-- | src/modules/objects/KvsObject_widget.h | 6 |
6 files changed, 34 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fb8d4cc6..8dc97f712 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -559,10 +559,10 @@ if(Qt5Widgets_FOUND) # Qt-WebKit support if(WANT_QTWEBKIT) - find_package(Qt5WebKit) - if(Qt5WebKit_FOUND) - list(APPEND qt5_kvirc_modules WebKit) - include_directories(${Qt5WebKit_INCLUDE_DIRS}) + find_package(Qt5WebKitWidgets) + if(Qt5WebKitWidgets_FOUND) + list(APPEND qt5_kvirc_modules WebKitWidgets) + include_directories(${Qt5WebKitWidgets_INCLUDE_DIRS}) set(COMPILE_WEBKIT_SUPPORT 1) endif() endif() 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 |