Message ID | 20240729175559.10512-1-laurent.pinchart@ideasonboard.com |
---|---|
State | Accepted |
Commit | d5cbf69a7feb39af5b767f2d000f9aead80d7563 |
Headers | show |
Series |
|
Related | show |
Laurent Pinchart <laurent.pinchart@ideasonboard.com> writes: > The Qt 6 qkeysequence.h header has an extra semicolon. This causes a > build failure with clang: > > /usr/include/qt6/QtGui/qkeysequence.h:139:26: error: extra ';' after member function definition [-Werror,-Wextra-semi] > 139 | Q_ENUM(SequenceMatch); > | ^ > > We can't fix the issue, so ignore the warning in qcam. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Milan Zamazal <mzamazal@redhat.com> > --- > src/apps/qcam/meson.build | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/apps/qcam/meson.build b/src/apps/qcam/meson.build > index c7fcfbeb6f61..f7c140643373 100644 > --- a/src/apps/qcam/meson.build > +++ b/src/apps/qcam/meson.build > @@ -36,7 +36,11 @@ qcam_resources = files([ > 'assets/shader/shaders.qrc', > ]) > > -qt6_cpp_args = [apps_cpp_args, '-DQT_NO_KEYWORDS'] > +qt6_cpp_args = [ > + apps_cpp_args, > + '-DQT_NO_KEYWORDS', > + '-Wno-extra-semi', > +] > > resources = qt6.preprocess(moc_headers : qcam_moc_headers, > qresources : qcam_resources, > > base-commit: c9152bad5ce905f5a31dbd05b40195f02c0cc2a9
Hi Laurent On Mon, Jul 29, 2024 at 08:55:59PM GMT, Laurent Pinchart wrote: > The Qt 6 qkeysequence.h header has an extra semicolon. This causes a > build failure with clang: > > /usr/include/qt6/QtGui/qkeysequence.h:139:26: error: extra ';' after member function definition [-Werror,-Wextra-semi] > 139 | Q_ENUM(SequenceMatch); > | ^ > > We can't fix the issue, so ignore the warning in qcam. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Thanks j > --- > src/apps/qcam/meson.build | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/apps/qcam/meson.build b/src/apps/qcam/meson.build > index c7fcfbeb6f61..f7c140643373 100644 > --- a/src/apps/qcam/meson.build > +++ b/src/apps/qcam/meson.build > @@ -36,7 +36,11 @@ qcam_resources = files([ > 'assets/shader/shaders.qrc', > ]) > > -qt6_cpp_args = [apps_cpp_args, '-DQT_NO_KEYWORDS'] > +qt6_cpp_args = [ > + apps_cpp_args, > + '-DQT_NO_KEYWORDS', > + '-Wno-extra-semi', > +] > > resources = qt6.preprocess(moc_headers : qcam_moc_headers, > qresources : qcam_resources, > > base-commit: c9152bad5ce905f5a31dbd05b40195f02c0cc2a9 > -- > Regards, > > Laurent Pinchart >
diff --git a/src/apps/qcam/meson.build b/src/apps/qcam/meson.build index c7fcfbeb6f61..f7c140643373 100644 --- a/src/apps/qcam/meson.build +++ b/src/apps/qcam/meson.build @@ -36,7 +36,11 @@ qcam_resources = files([ 'assets/shader/shaders.qrc', ]) -qt6_cpp_args = [apps_cpp_args, '-DQT_NO_KEYWORDS'] +qt6_cpp_args = [ + apps_cpp_args, + '-DQT_NO_KEYWORDS', + '-Wno-extra-semi', +] resources = qt6.preprocess(moc_headers : qcam_moc_headers, qresources : qcam_resources,
The Qt 6 qkeysequence.h header has an extra semicolon. This causes a build failure with clang: /usr/include/qt6/QtGui/qkeysequence.h:139:26: error: extra ';' after member function definition [-Werror,-Wextra-semi] 139 | Q_ENUM(SequenceMatch); | ^ We can't fix the issue, so ignore the warning in qcam. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- src/apps/qcam/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) base-commit: c9152bad5ce905f5a31dbd05b40195f02c0cc2a9