Fix Qt4 builds

OpenModelica · Feb 27, 2017 · 19ecd86 · 19ecd86
1 parent 2345a73
commit 19ecd86
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/OMEdit/OMEditGUI/Animation/Visualizer.cpp b/OMEdit/OMEditGUI/Animation/Visualizer.cpp
@@ -34,7 +34,9 @@
 
 #include "Visualizer.h"
 
-#include <QImage>
+#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 0))
+#include <QGLWidget>
+#endif
 #include <osg/Image>
 #include <osg/Shape>
 #include <osg/Node>
@@ -629,21 +631,24 @@ void UpdateVisitor::applyTexture(osg::StateSet* ss, std::string imagePath)
   }
 }
 
-
 osg::Image* UpdateVisitor::convertImage(const QImage& iImage)
 {
-   osg::Image* osgImage = new osg::Image();
-   if (false == iImage.isNull()) {
-      QImage glImage = iImage.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
-      if (false == glImage.isNull()) {
-         unsigned char* data = new unsigned char[glImage.byteCount()];
-         for(int i=0; i < glImage.byteCount(); ++i) {
-            data[i] = glImage.bits()[i];
-         }
-         osgImage->setImage(glImage.width(), glImage.height(), 1, 4, GL_RGBA, GL_UNSIGNED_BYTE, data, osg::Image::USE_NEW_DELETE, 1);
+  osg::Image* osgImage = new osg::Image();
+  if (false == iImage.isNull()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+    QImage glImage = iImage.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
+#else
+    QImage glImage = QGLWidget::convertToGLFormat(iImage);
+#endif
+    if (false == glImage.isNull()) {
+      unsigned char* data = new unsigned char[glImage.byteCount()];
+      for(int i=0; i < glImage.byteCount(); ++i) {
+        data[i] = glImage.bits()[i];
       }
-   }
-   return osgImage;
+      osgImage->setImage(glImage.width(), glImage.height(), 1, 4, GL_RGBA, GL_UNSIGNED_BYTE, data, osg::Image::USE_NEW_DELETE, 1);
+    }
+  }
+  return osgImage;
 }
 
 

diff --git a/OMEdit/OMEditGUI/Animation/Visualizer.h b/OMEdit/OMEditGUI/Animation/Visualizer.h
@@ -39,6 +39,7 @@
 #include <memory.h>
 #include <iostream>
 
+#include <QImage>
 #include <osg/NodeVisitor>
 #include <osg/Geode>
 #include <osg/MatrixTransform>