Skip to content

Started to port to qt5 [WORK-IN-PROGRESS] #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LinuxDonald wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Started to port to qt5 [WORK-IN-PROGRESS] #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/glwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions src/glwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions src/mainwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -74,7 +74,7 @@
</size>
</property>
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="filesTab">
<attribute name="title">
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/stable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <QFileInfo>
#include <QDir>
#include <QDirIterator>
#include <QGLWidget>
#include <QOpenGLWidget>
#include <QDialog>
#include <QMouseEvent>
#include <QTime>
Expand Down