Skip to content

Commit 82ec4dc

Browse files
zyrkielzyrkiel
committed
Fix the CI with Qt5
1 parent be8520f commit 82ec4dc

File tree

9 files changed

+105
-54
lines changed

9 files changed

+105
-54
lines changed

‎examples/openGL/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC ON)
77
set(CMAKE_AUTORCC ON)
88

99
find_package(
10-
QT NAMES Qt6
10+
QT NAMES Qt6 Qt5
1111
COMPONENTS Core
1212
Gui
1313
Widgets
@@ -19,7 +19,7 @@ find_package(
1919
REQUIRED)
2020

2121
find_package(
22-
Qt${QT_VERSION_MAJOR}
22+
Qt${QT_VERSION_MAJOR} 5.5
2323
COMPONENTS Core
2424
Gui
2525
Widgets

‎examples/openGL/fbitem.h‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,30 @@
44
#ifndef FBITEM_H
55
#define FBITEM_H
66

7-
#include <QQuickFramebufferObject>
8-
#include <QOpenGLVertexArrayObject>
97
#include <QOpenGLBuffer>
108
#include <QOpenGLShaderProgram>
9+
#include <QOpenGLVertexArrayObject>
10+
#include <QQuickFramebufferObject>
1111
#include <QVector3D>
12+
#include <QtGlobal>
13+
#include <QtQml>
14+
1215
#include "logo.h"
1316

17+
18+
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
19+
#define QML_ELEMENT
20+
#endif
21+
1422
struct StateBinder;
1523

1624
class FbItemRenderer : public QQuickFramebufferObject::Renderer
1725
{
1826
public:
1927
FbItemRenderer(bool multisample);
20-
void synchronize(QQuickFramebufferObject *item) override;
28+
void synchronize(QQuickFramebufferObject* item) override;
2129
void render() override;
22-
QOpenGLFramebufferObject *createFramebufferObject(const QSize &size) override;
30+
QOpenGLFramebufferObject* createFramebufferObject(const QSize& size) override;
2331

2432
private:
2533
void ensureInit();
@@ -45,7 +53,8 @@ class FbItemRenderer : public QQuickFramebufferObject::Renderer
4553
int m_lightPosLoc;
4654
QVector3D m_rotation;
4755

48-
enum Dirty {
56+
enum Dirty
57+
{
4958
DirtyProjection = 0x01,
5059
DirtyCamera = 0x02,
5160
DirtyWorld = 0x04,
@@ -67,19 +76,20 @@ class FbItem : public QQuickFramebufferObject
6776
QML_ELEMENT
6877

6978
public:
70-
explicit FbItem(QQuickItem *parent = nullptr);
79+
explicit FbItem(QQuickItem* parent = nullptr);
7180

72-
QQuickFramebufferObject::Renderer *createRenderer() const override;
81+
QQuickFramebufferObject::Renderer* createRenderer() const override;
7382

7483
QVector3D eye() const { return m_eye; }
75-
void setEye(const QVector3D &v);
84+
void setEye(const QVector3D& v);
7685
QVector3D target() const { return m_target; }
77-
void setTarget(const QVector3D &v);
86+
void setTarget(const QVector3D& v);
7887

7988
QVector3D rotation() const { return m_rotation; }
80-
void setRotation(const QVector3D &v);
89+
void setRotation(const QVector3D& v);
8190

82-
enum SyncState {
91+
enum SyncState
92+
{
8393
CameraNeedsSync = 0x01,
8494
RotationNeedsSync = 0x02,
8595
AllNeedsSync = 0xFF
@@ -97,4 +107,4 @@ class FbItem : public QQuickFramebufferObject
97107
bool m_multisample;
98108
};
99109

100-
#endif // FBITEM_H
110+
#endif // FBITEM_H

‎examples/openGL/glwidget.cpp‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#include <QCoreApplication>
88
#include <math.h>
99

10-
bool GLWidget::m_transparent = false;
10+
bool MyGLWidget::m_transparent = false;
1111

12-
GLWidget::GLWidget(QWidget *parent)
12+
MyGLWidget::MyGLWidget(QWidget *parent)
1313
: QOpenGLWidget(parent)
1414
{
1515
m_core = QSurfaceFormat::defaultFormat().profile() == QSurfaceFormat::CoreProfile;
@@ -25,17 +25,17 @@ GLWidget::GLWidget(QWidget *parent)
2525
setAttribute(Qt::WA_AlwaysStackOnTop);
2626
}
2727

28-
GLWidget::~GLWidget()
28+
MyGLWidget::~MyGLWidget()
2929
{
3030
cleanup();
3131
}
3232

33-
QSize GLWidget::minimumSizeHint() const
33+
QSize MyGLWidget::minimumSizeHint() const
3434
{
3535
return QSize(50, 50);
3636
}
3737

38-
QSize GLWidget::sizeHint() const
38+
QSize MyGLWidget::sizeHint() const
3939
{
4040
return QSize(400, 400);
4141
}
@@ -48,7 +48,7 @@ static void qNormalizeAngle(int &angle)
4848
angle -= 360 * 16;
4949
}
5050

51-
void GLWidget::setXRotation(int angle)
51+
void MyGLWidget::setXRotation(int angle)
5252
{
5353
qNormalizeAngle(angle);
5454
if (angle != m_xRot) {
@@ -58,7 +58,7 @@ void GLWidget::setXRotation(int angle)
5858
}
5959
}
6060

61-
void GLWidget::setYRotation(int angle)
61+
void MyGLWidget::setYRotation(int angle)
6262
{
6363
qNormalizeAngle(angle);
6464
if (angle != m_yRot) {
@@ -68,7 +68,7 @@ void GLWidget::setYRotation(int angle)
6868
}
6969
}
7070

71-
void GLWidget::setZRotation(int angle)
71+
void MyGLWidget::setZRotation(int angle)
7272
{
7373
qNormalizeAngle(angle);
7474
if (angle != m_zRot) {
@@ -78,7 +78,7 @@ void GLWidget::setZRotation(int angle)
7878
}
7979
}
8080

81-
void GLWidget::cleanup()
81+
void MyGLWidget::cleanup()
8282
{
8383
if (m_program == nullptr){
8484
return;
@@ -88,7 +88,7 @@ void GLWidget::cleanup()
8888
delete m_program;
8989
m_program = nullptr;
9090
doneCurrent();
91-
QObject::disconnect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &GLWidget::cleanup);
91+
QObject::disconnect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &MyGLWidget::cleanup);
9292
}
9393

9494
static const char *vertexShaderSourceCore =
@@ -146,7 +146,7 @@ static const char *fragmentShaderSource =
146146
" gl_FragColor = vec4(col, 1.0);\n"
147147
"}\n";
148148

149-
void GLWidget::initializeGL()
149+
void MyGLWidget::initializeGL()
150150
{
151151
// In this example the widget's corresponding top-level window can change
152152
// several times during the widget's lifetime. Whenever this happens, the
@@ -155,7 +155,7 @@ void GLWidget::initializeGL()
155155
// aboutToBeDestroyed() signal, instead of the destructor. The emission of
156156
// the signal will be followed by an invocation of initializeGL() where we
157157
// can recreate all resources.
158-
connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &GLWidget::cleanup, Qt::UniqueConnection);
158+
connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &MyGLWidget::cleanup, Qt::UniqueConnection);
159159

160160
initializeOpenGLFunctions();
161161
glClearColor(0, 0, 0, m_transparent ? 0 : 1);
@@ -198,7 +198,7 @@ void GLWidget::initializeGL()
198198
m_program->release();
199199
}
200200

201-
void GLWidget::setupVertexAttribs()
201+
void MyGLWidget::setupVertexAttribs()
202202
{
203203
m_logoVbo.bind();
204204
QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
@@ -211,7 +211,7 @@ void GLWidget::setupVertexAttribs()
211211
m_logoVbo.release();
212212
}
213213

214-
void GLWidget::paintGL()
214+
void MyGLWidget::paintGL()
215215
{
216216
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
217217
glEnable(GL_DEPTH_TEST);
@@ -234,21 +234,31 @@ void GLWidget::paintGL()
234234
m_program->release();
235235
}
236236

237-
void GLWidget::resizeGL(int w, int h)
237+
void MyGLWidget::resizeGL(int w, int h)
238238
{
239239
m_proj.setToIdentity();
240240
m_proj.perspective(45.0f, GLfloat(w) / h, 0.01f, 100.0f);
241241
}
242242

243-
void GLWidget::mousePressEvent(QMouseEvent *event)
243+
void MyGLWidget::mousePressEvent(QMouseEvent *event)
244244
{
245+
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
245246
m_lastPos = event->position().toPoint();
247+
#else
248+
m_lastPos = event->pos();
249+
#endif
246250
}
247251

248-
void GLWidget::mouseMoveEvent(QMouseEvent *event)
252+
void MyGLWidget::mouseMoveEvent(QMouseEvent *event)
249253
{
250-
int dx = event->position().toPoint().x() - m_lastPos.x();
251-
int dy = event->position().toPoint().y() - m_lastPos.y();
254+
255+
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
256+
QPoint pos = event->position().toPoint();
257+
#else
258+
QPoint pos = event->pos();
259+
#endif
260+
int dx = pos.x() - m_lastPos.x();
261+
int dy = pos.y() - m_lastPos.y();
252262

253263
if (event->buttons() & Qt::LeftButton) {
254264
setXRotation(m_xRot + 8 * dy);
@@ -257,5 +267,5 @@ void GLWidget::mouseMoveEvent(QMouseEvent *event)
257267
setXRotation(m_xRot + 8 * dy);
258268
setZRotation(m_zRot + 8 * dx);
259269
}
260-
m_lastPos = event->position().toPoint();
270+
m_lastPos = pos;
261271
}

‎examples/openGL/glwidget.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
QT_FORWARD_DECLARE_CLASS(QOpenGLShaderProgram)
1414

15-
class GLWidget : public QOpenGLWidget, protected QOpenGLFunctions
15+
class MyGLWidget : public QOpenGLWidget, protected QOpenGLFunctions
1616
{
1717
Q_OBJECT
1818

1919
public:
20-
GLWidget(QWidget *parent = nullptr);
21-
~GLWidget();
20+
MyGLWidget(QWidget *parent = nullptr);
21+
~MyGLWidget();
2222

2323
static bool isTransparent() { return m_transparent; }
2424
static void setTransparent(bool t) { m_transparent = t; }

‎examples/openGL/logo.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
#define LOGO_H
66

77
#include <qopengl.h>
8-
#include <QList>
8+
#include <vector>
99
#include <QVector3D>
1010

1111
class Logo
1212
{
1313
public:
1414
Logo();
15-
const GLfloat *constData() const { return m_data.constData(); }
15+
const GLfloat *constData() const { return m_data.data(); }
1616
int count() const { return m_count; }
1717
int vertexCount() const { return m_count / 6; }
1818

@@ -21,7 +21,7 @@ class Logo
2121
void extrude(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
2222
void add(const QVector3D &v, const QVector3D &n);
2323

24-
QList<GLfloat> m_data;
24+
std::vector<GLfloat> m_data;
2525
int m_count = 0;
2626
};
2727

‎examples/openGL/main.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,31 @@
33
#include <QCommandLineParser>
44
#include <QGuiApplication>
55
#include <QOpenGLContext>
6-
#include <QScreen>
76
#include <QQuickWindow>
7+
#include <QScreen>
88

99
#include <glwindow.h>
1010
#include <mainwindow.h>
1111

12-
1312
int main(int argc, char* argv[])
1413
{
1514
// https://doc.qt.io/qt-6/qtdatavisualization-known-issues.html
16-
// Use either `qputenv("QSG_RHI_BACKEND", "opengl");` or the following line
17-
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
15+
// Use either `QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);` or
16+
// the following line
17+
qputenv("QSG_RHI_BACKEND", "opengl");
1818

19-
// Disable warnings when attempts are made to convert non-convertible non-native widgets
20-
// to native widgets (such as QQuickWidget)
19+
// Disable warnings when attempts are made to convert non-convertible
20+
// non-native widgets to native widgets (such as QQuickWidget)
2121
QApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
2222

2323
// Enable ADS AutoHide
24-
ads::CDockManager::setAutoHideConfigFlags(ads::CDockManager::DefaultAutoHideConfig);
24+
ads::CDockManager::setAutoHideConfigFlags(
25+
ads::CDockManager::DefaultAutoHideConfig);
2526

2627
QApplication a(argc, argv);
2728

2829
MainWindow* w = new MainWindow();
29-
30+
3031
// Release memory when closing main window and quit application
3132
w->setAttribute(Qt::WA_DeleteOnClose);
3233

‎examples/openGL/mainwindow.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
#include <glwidget.h>
1717
#include <glwindow.h>
1818

19+
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
20+
using namespace QtCharts;
21+
#endif
22+
1923
class OpenGLChartWidget : public QWidget
2024
{
2125
public:
@@ -118,8 +122,8 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
118122
OpenGLChartWidget* openGL_chart = new OpenGLChartWidget(this);
119123
ChartWidget* simple_chart = new ChartWidget(this);
120124
OpenGLWindowContainer* openGL_container = new OpenGLWindowContainer(this);
121-
GLWidget* gl_widget = new GLWidget(this);
122-
GLWidget* gl_widget_2 = new GLWidget(this);
125+
MyGLWidget* gl_widget = new MyGLWidget(this);
126+
MyGLWidget* gl_widget_2 = new MyGLWidget(this);
123127
QuickViewContainer* quick_view_container = new QuickViewContainer(this);
124128

125129
QLabel* l = new QLabel();

0 commit comments

Comments
 (0)