[ci] Prepare for Qt 6.6

ossia · Sep 16, 2023 · ea7613f · ea7613f
1 parent 4d58c93
commit ea7613f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/3rdparty/libossia b/3rdparty/libossia
diff --git a/src/lib/score/gfx/QRhiGles2.hpp b/src/lib/score/gfx/QRhiGles2.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#if __has_include(<QtGui/rhi/qrhi_platform.h>)
+#include <QtGui/rhi/qrhi_platform.h>
+#include <QtGui/private/qrhigles2_p.h>
+#else
+#include <QtGui/private/qrhigles2_p_p.h>
+#endif
diff --git a/src/plugins/score-plugin-gfx/Gfx/Shmdata/ShmdataOutputDevice.cpp b/src/plugins/score-plugin-gfx/Gfx/Shmdata/ShmdataOutputDevice.cpp
@@ -19,13 +19,7 @@
 #include <QLineEdit>
 #include <QOffscreenSurface>
 #include <QSpinBox>
-
-#if __has_include(<QtGui/rhi/qrhi_platform.h>)
-#include <QtGui/rhi/qrhi_platform.h>
-#else
-#include <QtGui/private/qrhigles2_p_p.h>
-#endif
-
+#include <score/gfx/QRhiGles2.hpp>
 #include <shmdata/writer.hpp>
 
 #include <wobjectimpl.h>

diff --git a/src/plugins/score-plugin-gfx/Gfx/Spout/SpoutOutput.cpp b/src/plugins/score-plugin-gfx/Gfx/Spout/SpoutOutput.cpp
@@ -12,8 +12,7 @@
 #include <QLabel>
 #include <QOffscreenSurface>
 #include <Spout/SpoutSender.h>
-
-#include <QtGui/private/qrhigles2_p_p.h>
+#include <score/gfx/QRhiGles2.hpp>
 
 #include <wobjectimpl.h>
 

diff --git a/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonInput.mm b/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonInput.mm
@@ -14,7 +14,7 @@
 #include <QLabel>
 
 #include <wobjectimpl.h>
-#include <QtGui/private/qrhigles2_p_p.h>
+#include <score/gfx/QRhiGles2.hpp>
 
 namespace Gfx::Syphon
 {

diff --git a/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonOutput.mm b/src/plugins/score-plugin-gfx/Gfx/Syphon/SyphonOutput.mm
@@ -7,7 +7,7 @@
 #include <Gfx/GfxApplicationPlugin.hpp>
 
 #include <Gfx/Syphon/SyphonHelpers.hpp>
-#include <QtGui/private/qrhigles2_p_p.h>
+#include <score/gfx/QRhiGles2.hpp>
 #include <QOpenGLContext>
 #include <QOffscreenSurface>
 #include <QFormLayout>