From c07c8ac0ad5c0c0d3ac5b624d5f24d8cd7cdc85d Mon Sep 17 00:00:00 2001
From: Thomas Kowaliczek <linuxdonald@posteo.de>
Date: Fri, 6 Jan 2017 18:51:40 +0100
Subject: [PATCH] Started to port to qt5

---
 src/glwidget.cpp  |  2 +-
 src/glwidget.h    |  4 ++--
 src/mainwindow.ui | 10 +++++-----
 src/stable.h      |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/glwidget.cpp b/src/glwidget.cpp
index 96bdf40..1eb4d50 100644
--- a/src/glwidget.cpp
+++ b/src/glwidget.cpp
@@ -34,7 +34,7 @@
 const int timerInterval = 20;
 
 GLWidget::GLWidget(QWidget* parent)
-	: QGLWidget(parent), mCam_xpos(-0.5f), mCam_ypos(-0.5f), mCam_zpos(-2.0f),
+	: QOpenGLWidget(parent), mCam_xpos(-0.5f), mCam_ypos(-0.5f), mCam_zpos(-2.0f),
 	showOccupation(false),
 	atlasBlocks(NULL)
 {
diff --git a/src/glwidget.h b/src/glwidget.h
index 9ebe52c..4168676 100644
--- a/src/glwidget.h
+++ b/src/glwidget.h
@@ -21,13 +21,13 @@
 
 #pragma once
 
-#include <QGLWidget>
+#include <QOpenGLWidget>
 #include <QImage>
 #include "atlas.h"
 
 class MainWindow;
 
-class GLWidget : public QGLWidget
+class GLWidget : public QOpenGLWidget
 {
 	Q_OBJECT
 public:
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 8e793e9..9bc5952 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -33,7 +33,7 @@
        <enum>QLayout::SetDefaultConstraint</enum>
       </property>
       <item>
-       <widget class="GLWidget" name="previewWidget" native="true">
+       <widget class="OpenGLWidget" name="previewWidget" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>0</horstretch>
@@ -74,7 +74,7 @@
        </size>
       </property>
       <property name="currentIndex">
-       <number>2</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="filesTab">
        <attribute name="title">
@@ -184,7 +184,7 @@
           <x>10</x>
           <y>90</y>
           <width>341</width>
-          <height>141</height>
+          <height>162</height>
          </rect>
         </property>
         <layout class="QFormLayout" name="formLayout">
@@ -301,7 +301,7 @@
           <x>80</x>
           <y>530</y>
           <width>171</width>
-          <height>43</height>
+          <height>48</height>
          </rect>
         </property>
         <layout class="QFormLayout" name="formLayout_2">
@@ -421,7 +421,7 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>GLWidget</class>
+   <class>OpenGLWidget</class>
    <extends>QWidget</extends>
    <header>glwidget.h</header>
    <container>1</container>
diff --git a/src/stable.h b/src/stable.h
index 095bd94..f131136 100644
--- a/src/stable.h
+++ b/src/stable.h
@@ -31,7 +31,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QDirIterator>
-#include <QGLWidget>
+#include <QOpenGLWidget>
 #include <QDialog>
 #include <QMouseEvent>
 #include <QTime>