Skip to content

Commit e75af15

Browse files
ABBAPOHABBAPOH
committed
port to qt6
1 parent fe13423 commit e75af15

File tree

49 files changed

+312
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+312
-150
lines changed

‎1.3.window/window.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#include "window.h"
22

3+
#if QT_VERSION >= 0x060000
4+
#include <QtOpenGL/QOpenGLVersionFunctionsFactory>
5+
#endif
6+
37
#include <QtCore/QDebug>
48

59
Window::Window()
@@ -15,7 +19,11 @@ void Window::initializeGL()
1519
return;
1620
}
1721

22+
#if QT_VERSION >= 0x060000
23+
m_funcs = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_3_Core>(context());
24+
#else
1825
m_funcs = context()->versionFunctions<QOpenGLFunctions_3_3_Core>();
26+
#endif
1927
if (!m_funcs) {
2028
qCritical() << "Can't get OGL 3.2";
2129
close();

‎1.3.window/window.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef WINDOW_H
22
#define WINDOW_H
33

4-
#include <QtGui/QOpenGLFunctions_3_3_Core>
5-
#include <QtGui/QOpenGLWindow>
4+
#include <QOpenGLFunctions_3_3_Core>
5+
#include <QOpenGLWindow>
66

77
class Window : public QOpenGLWindow
88
{

‎1.4.0.triangle/window.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#include "window.h"
22

3+
#if QT_VERSION >= 0x060000
4+
#include <QtOpenGL/QOpenGLVersionFunctionsFactory>
5+
#endif
6+
37
#include <QtCore/QDebug>
48

59
const char* const vertexShaderSource =
@@ -36,7 +40,11 @@ void Window::initializeGL()
3640
return;
3741
}
3842

43+
#if QT_VERSION >= 0x060000
44+
m_funcs = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_3_Core>(context());
45+
#else
3946
m_funcs = context()->versionFunctions<QOpenGLFunctions_3_3_Core>();
47+
#endif
4048
if (!m_funcs) {
4149
qCritical() << "Can't get OGL 3.2";
4250
close();

‎1.4.0.triangle/window.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#ifndef WINDOW_H
22
#define WINDOW_H
33

4-
#include <QtGui/QOpenGLBuffer>
5-
#include <QtGui/QOpenGLFunctions_3_3_Core>
6-
#include <QtGui/QOpenGLShaderProgram>
7-
#include <QtGui/QOpenGLVertexArrayObject>
8-
#include <QtGui/QOpenGLWindow>
4+
#include <QOpenGLBuffer>
5+
#include <QOpenGLFunctions_3_3_Core>
6+
#include <QOpenGLShaderProgram>
7+
#include <QOpenGLVertexArrayObject>
8+
#include <QOpenGLWindow>
99

1010
#include <memory>
1111

‎1.4.1.rect/window.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#include "window.h"
22

3+
#if QT_VERSION >= 0x060000
4+
#include <QtOpenGL/QOpenGLVersionFunctionsFactory>
5+
#endif
6+
37
#include <QtCore/QDebug>
48

59
const char* const vertexShaderSource =
@@ -36,7 +40,11 @@ void Window::initializeGL()
3640
return;
3741
}
3842

43+
#if QT_VERSION >= 0x060000
44+
m_funcs = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_3_Core>(context());
45+
#else
3946
m_funcs = context()->versionFunctions<QOpenGLFunctions_3_3_Core>();
47+
#endif
4048
if (!m_funcs) {
4149
qCritical() << "Can't get OGL 3.2";
4250
close();

‎1.4.1.rect/window.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#ifndef WINDOW_H
22
#define WINDOW_H
33

4-
#include <QtGui/QOpenGLBuffer>
5-
#include <QtGui/QOpenGLFunctions>
6-
#include <QtGui/QOpenGLFunctions_3_3_Core>
7-
#include <QtGui/QOpenGLShaderProgram>
8-
#include <QtGui/QOpenGLVertexArrayObject>
9-
#include <QtGui/QOpenGLWindow>
4+
#include <QOpenGLBuffer>
5+
#include <QOpenGLFunctions>
6+
#include <QOpenGLFunctions_3_3_Core>
7+
#include <QOpenGLShaderProgram>
8+
#include <QOpenGLVertexArrayObject>
9+
#include <QOpenGLWindow>
1010

1111
#include <memory>
1212

‎1.5.shaders/window.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#include "window.h"
22

3+
#if QT_VERSION >= 0x060000
4+
#include <QtOpenGL/QOpenGLVersionFunctionsFactory>
5+
#endif
6+
37
#include <QtCore/QDebug>
48

59
Window::Window()
@@ -15,7 +19,11 @@ void Window::initializeGL()
1519
return;
1620
}
1721

22+
#if QT_VERSION >= 0x060000
23+
m_funcs = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_3_Core>(context());
24+
#else
1825
m_funcs = context()->versionFunctions<QOpenGLFunctions_3_3_Core>();
26+
#endif
1927
if (!m_funcs) {
2028
qCritical() << "Can't get OGL 3.2";
2129
close();

‎1.5.shaders/window.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#ifndef WINDOW_H
22
#define WINDOW_H
33

4-
#include <QtGui/QOpenGLBuffer>
5-
#include <QtGui/QOpenGLFunctions_3_3_Core>
6-
#include <QtGui/QOpenGLShaderProgram>
7-
#include <QtGui/QOpenGLVertexArrayObject>
8-
#include <QtGui/QOpenGLWindow>
4+
#include <QOpenGLBuffer>
5+
#include <QOpenGLFunctions_3_3_Core>
6+
#include <QOpenGLShaderProgram>
7+
#include <QOpenGLVertexArrayObject>
8+
#include <QOpenGLWindow>
99

1010
#include <memory>
1111

‎1.6.0.texture/window.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
#include "window.h"
22

3-
#include <QDebug>
4-
#include <QCoreApplication>
5-
#include <QTime>
3+
#if QT_VERSION >= 0x060000
4+
#include <QtOpenGL/QOpenGLVersionFunctionsFactory>
5+
#endif
6+
7+
#include <QtCore/QDebug>
8+
#include <QtCore/QCoreApplication>
9+
#include <QtCore/QTime>
610

711
Window::Window()
812
{
@@ -17,7 +21,11 @@ void Window::initializeGL()
1721
return;
1822
}
1923

24+
#if QT_VERSION >= 0x060000
25+
m_funcs = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_3_Core>(context());
26+
#else
2027
m_funcs = context()->versionFunctions<QOpenGLFunctions_3_3_Core>();
28+
#endif
2129
if (!m_funcs) {
2230
qCritical() << "Can't get OGL 3.2";
2331
close();

‎1.6.0.texture/window.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#ifndef WINDOW_H
22
#define WINDOW_H
33

4-
#include <QtGui/QOpenGLBuffer>
5-
#include <QtGui/QOpenGLFunctions_3_3_Core>
6-
#include <QtGui/QOpenGLShaderProgram>
7-
#include <QtGui/QOpenGLVertexArrayObject>
8-
#include <QtGui/QOpenGLWindow>
4+
#include <QOpenGLBuffer>
5+
#include <QOpenGLFunctions_3_3_Core>
6+
#include <QOpenGLShaderProgram>
7+
#include <QOpenGLVertexArrayObject>
8+
#include <QOpenGLWindow>
99

1010
#include <memory>
1111

0 commit comments

Comments
 (0)