aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
authorGravatar Fabio Bas2012-10-31 18:44:24 +0000
committerGravatar Fabio Bas2012-10-31 18:44:24 +0000
commit0e33f73fbff89fa8b5d0b3336e4642559ac153d3 (patch)
tree5a038197a46b0f379193d3e62edee3bdb40f12ed /src/modules/objects
parent- update KviOsInfo with values from the winsdk8 (diff)
downloadKVIrc-0e33f73fbff89fa8b5d0b3336e4642559ac153d3.tar.gz
KVIrc-0e33f73fbff89fa8b5d0b3336e4642559ac153d3.tar.bz2
KVIrc-0e33f73fbff89fa8b5d0b3336e4642559ac153d3.zip
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
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/KvsObject_widget.h6
1 files changed, 5 insertions, 1 deletions
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