This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: qvidcap: enable Qt6 compile with Qt OpenGL support Author: Peter Seiderer <ps.rep...@gmx.net> Date: Thu Nov 16 13:24:02 2023 +0100 - update qmake project file for Qt6 (openglwidgets) - fix includes for Qt6 (QOpenGLShaderProgram instead of QtGui/QOpenGLShaderProgram and QOpenGLPaintDevice instead of QtGui/QOpenGLPaintDevice) Signed-off-by: Peter Seiderer <ps.rep...@gmx.net> Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> utils/qvidcap/capture.cpp | 4 ++++ utils/qvidcap/capture.h | 4 ++++ utils/qvidcap/paint.cpp | 4 ++++ utils/qvidcap/qvidcap.pro | 1 + 4 files changed, 13 insertions(+) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=1c62cb234e4b3bd5fc62600af027a1983d9975b0 diff --git a/utils/qvidcap/capture.cpp b/utils/qvidcap/capture.cpp index 0b4c4115cf1b..1e3597b0be14 100644 --- a/utils/qvidcap/capture.cpp +++ b/utils/qvidcap/capture.cpp @@ -13,7 +13,11 @@ #include <QtCore/QTextStream> #include <QtCore/QCoreApplication> #include <QtGui/QOpenGLContext> +#if QT_VERSION < 0x060000 #include <QtGui/QOpenGLPaintDevice> +#else +#include <QOpenGLPaintDevice> +#endif #include <QtGui/QContextMenuEvent> #include <QtGui/QKeyEvent> #include <QtGui/QPainter> diff --git a/utils/qvidcap/capture.h b/utils/qvidcap/capture.h index 37f5bfc5fd84..8ebe76a9d0d3 100644 --- a/utils/qvidcap/capture.h +++ b/utils/qvidcap/capture.h @@ -16,7 +16,11 @@ #include <QAction> #include <QActionGroup> #include <QScrollArea> +#if QT_VERSION < 0x060000 #include <QtGui/QOpenGLShaderProgram> +#else +#include <QOpenGLShaderProgram> +#endif #include "qvidcap.h" diff --git a/utils/qvidcap/paint.cpp b/utils/qvidcap/paint.cpp index c5aadb09ffa4..0246de60ef47 100644 --- a/utils/qvidcap/paint.cpp +++ b/utils/qvidcap/paint.cpp @@ -13,7 +13,11 @@ #include <QtCore/QTextStream> #include <QtCore/QCoreApplication> #include <QtGui/QOpenGLContext> +#if QT_VERSION < 0x060000 #include <QtGui/QOpenGLPaintDevice> +#else +#include <QOpenGLPaintDevice> +#endif #include <QtGui/QContextMenuEvent> #include <QtGui/QKeyEvent> #include <QtGui/QPainter> diff --git a/utils/qvidcap/qvidcap.pro b/utils/qvidcap/qvidcap.pro index cf7d3ca5306f..d08f0059bac4 100644 --- a/utils/qvidcap/qvidcap.pro +++ b/utils/qvidcap/qvidcap.pro @@ -7,6 +7,7 @@ INCLUDEPATH += . ../libv4l2util ../../lib/include ../../include CONFIG += debug greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +greaterThan(QT_MAJOR_VERSION, 5): QT += openglwidgets # adjust to your local meson build path MESON_BUILD_PATH = $$PWD/build-meson _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
