From c771c2ed93e4cbd42bdd0641717f7c8439a575e0 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 6 Dec 2013 01:36:43 +0100
Subject: [PATCH] + fixes #0000282, + fixes #0001028

---
 src/Gui/View3DInventor.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp
index 30b13e21e..f4f1f3466 100644
--- a/src/Gui/View3DInventor.cpp
+++ b/src/Gui/View3DInventor.cpp
@@ -53,6 +53,7 @@
 # include <Inventor/events/SoEvent.h>
 # include <Inventor/fields/SoSFString.h>
 # include <Inventor/fields/SoSFColor.h>
+# include <Inventor/Qt/SoQtBasic.h>
 #endif
 # include <QStackedWidget>
 
@@ -113,12 +114,17 @@ View3DInventor::View3DInventor(Gui::Document* pcDocument, QWidget* parent, Qt::W
 
     // create the inventor widget and set the defaults
 #if !defined (NO_USE_QT_MDI_AREA)
+#if SOQT_MAJOR_VERSION > 1 || (SOQT_MAJOR_VERSION == 1 && SOQT_MINOR_VERSION >= 5)
+    _viewer = new View3DInventorViewer(this);
+#else
     _viewer = new View3DInventorViewer(0);
+#endif
     _viewer->setDocument(this->_pcDocument);
     stack->addWidget(_viewer->getWidget());
     setCentralWidget(stack);
 #else
     _viewer = new View3DInventorViewer(this);
+    _viewer->setDocument(this->_pcDocument);
 #endif
     // apply the user settings
     OnChange(*hGrp,"EyeDistance");