From Jannik Heller, "I've added the check for Qt version mismatches into osgQt as suggested in http://forum.openscenegraph.org/viewtopic.php?t=14999.

When an application is built with Qt4, but osgQt was built with Qt5 (or vice versa), upon #includeing osgQt users will receive an #error aborting the build. This at least provides a proper error message rather than a crash, while we are working on better fixes for the problem." git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14918 16af8721-9629-0410-8352-f15c8da7e697
2015-06-15 19:59:01 +00:00
parent 824cc95518
commit 1e0d682979
7 changed files with 23 additions and 0 deletions
--- a/include/osgQt/GraphicsWindowQt
+++ b/include/osgQt/GraphicsWindowQt
@@ -18,6 +18,7 @@

 #include <osgViewer/GraphicsWindow>
 #include <osgQt/Export>
+#include <osgQt/Version>

 #include <QMutex>
 #include <QEvent>
--- a/include/osgQt/QFontImplementation
+++ b/include/osgQt/QFontImplementation
@@ -15,6 +15,7 @@

 #include <osgText/Font>
 #include <osgQt/Export>
+#include <osgQt/Version>

 #include <QtGui/QFont>

--- a/include/osgQt/QGraphicsViewAdapter
+++ b/include/osgQt/QGraphicsViewAdapter
@@ -19,6 +19,7 @@
 #include <osg/Image>
 #include <osg/observer_ptr>
 #include <osgQt/Export>
+#include <osgQt/Version>

 #include <QPointer>
 #include <QGraphicsScene>
--- a/include/osgQt/QWebViewImage
+++ b/include/osgQt/QWebViewImage
@@ -26,6 +26,7 @@

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

 namespace osgQt
 {
--- a/include/osgQt/QWidgetImage
+++ b/include/osgQt/QWidgetImage
@@ -15,6 +15,7 @@
 #define QWIDGETIMAGE

 #include <osgQt/QGraphicsViewAdapter>
+#include <osgQt/Version>
 #include <osg/Image>

 namespace osgQt