From Kristofer Tingdahl, with additions from Riccardo Corsi and Robert Milharcic, support for Qt5 build

2013-06-10 14:34:25 +00:00
parent 8cf9600e2c
commit bdfd18dc03
25 changed files with 184 additions and 90 deletions
--- a/include/osgQt/QWebViewImage
+++ b/include/osgQt/QWebViewImage
@@ -17,7 +17,12 @@
 // make sure this header isn't built as par of osgQt, leaving it to applications to build
 #if !defined(OSGQT_LIBRARY) && !defined(OSG_LIBRARY_STATIC)

-#include <QtWebKit/QtWebKit>
+#if QT_VERSION >= 0x050000
+# include <QtWebKitWidgets>
+#else
+# include <QtWebKit>
+#endif
+

 #include <osgWidget/Browser>
 #include <osgQt/QGraphicsViewAdapter>