Update for Qt 5.5.0

CWRUChielLab · Aug 30, 2015 · 2582071 · 2582071
1 parent c2bca4e
commit 2582071
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/src/ctrl.cpp b/src/ctrl.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <QtGui>
+#include <QtWidgets>
 #include <time.h>
 #include <math.h>
 

diff --git a/src/gui.cpp b/src/gui.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <QtGui>
+#include <QtWidgets>
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
 #include <SFMT.h>

diff --git a/src/paint.cpp b/src/paint.cpp
@@ -204,6 +204,8 @@ NernstPainter::resetPaint()
 void
 NernstPainter::initializeGL()
 {
+   initializeOpenGLFunctions();
+
    qglClearColor( Qt::white );
    glShadeModel( GL_FLAT );
    glEnable( GL_DEPTH_TEST );

diff --git a/src/paint.h b/src/paint.h
@@ -27,9 +27,10 @@
 
 
 #include <QGLWidget>
+#include <QOpenGLFunctions_1_1>
 
 
-class NernstPainter : public QGLWidget
+class NernstPainter : public QGLWidget, public QOpenGLFunctions_1_1
 {
    Q_OBJECT
 

diff --git a/src/status.cpp b/src/status.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "status.h"
 #include "gui.h"