move Image viewer to QOpenGLWidget

2017-03-08 16:34:10 +01:00
parent 097818eceb
commit 5763de76bd
5 changed files with 1087 additions and 4 deletions
--- a/src/Mod/Image/Gui/ImageView.cpp
+++ b/src/Mod/Image/Gui/ImageView.cpp
@@ -28,7 +28,6 @@
 #endif

 #include "ImageView.h"
-#include "GLImageBox.h"
 #include "../App/ImageBase.h"
 #include "XpmImages.h"

@@ -65,7 +64,11 @@ ImageView::ImageView(QWidget* parent)
    // Since Qt the class QGLWidget is marked as deprecated and should be
    // replaced by QOpenGLWidget.

+#if defined(HAVE_QT5_OPENGL)
+  _pGLImageBox = new GLImageBox(this);
+#else
  _pGLImageBox = new GLImageBox(parent);
+#endif // HAVE_QT5_OPENGL
 #else
  _pGLImageBox = new GLImageBox(this);
 #endif