[libcamera-devel] [PATCH 1/3] apps: qcam: Port to Qt 6

[Neal Gompa]

On Sun, Jan 21, 2024 at 4:35 PM Barnabás Pőcze via libcamera-devel
<libcamera-devel at lists.libcamera.org> wrote:
>
> Hi
>
>
> 2024. január 21., vasárnap 22:09 keltezéssel, Neal Gompa via libcamera-devel írta:
>
> > Open source Qt 5 has been effectively end of life since the release
> > of Qt 6, and Qt 6 has current LTS releases now.
> >
> > This change ports qcam to Qt 6.2 and drops some of the baggage related
> > to Qt 5 that is no longer applicable.
> >
> > Signed-off-by: Neal Gompa <neal at gompa.dev>
> > ---
> >  README.rst                |  2 +-
> >  src/apps/qcam/meson.build | 45 +++++++++++----------------------------
> >  2 files changed, 14 insertions(+), 33 deletions(-)
> >
> > diff --git a/README.rst b/README.rst
> > index 315738ee..6f1c9302 100644
> > --- a/README.rst
> > +++ b/README.rst
> > @@ -88,7 +88,7 @@ for cam: [optional]
> >          - libsdl2-dev: Enables the SDL sink
> >
> >  for qcam: [optional]
> > -        libtiff-dev qtbase5-dev qttools5-dev-tools
> > +        libtiff-dev qt6-base-dev qt6-tools-dev-tools
> >
> >  for tracing with lttng: [optional]
> >          liblttng-ust-dev python3-jinja2 lttng-tools
> > diff --git a/src/apps/qcam/meson.build b/src/apps/qcam/meson.build
> > index 6cf4c171..c7fcfbeb 100644
> > --- a/src/apps/qcam/meson.build
> > +++ b/src/apps/qcam/meson.build
> > @@ -1,13 +1,13 @@
> >  # SPDX-License-Identifier: CC0-1.0
> >
> > -qt5 = import('qt5')
> > -qt5_dep = dependency('qt5',
> > +qt6 = import('qt6')
> > +qt6_dep = dependency('qt6',
> >                       method : 'pkg-config',
> > -                     modules : ['Core', 'Gui', 'Widgets'],
> > +                     modules : ['Core', 'Gui', 'OpenGL', 'OpenGLWidgets', 'Widgets'],
> >                       required : get_option('qcam'),
> > -                     version : '>=5.4')
> > +                     version : '>=6.2')
>
> https://mesonbuild.com/Qt6-module.html says
>
>   Warning: before version 0.63.0 Meson would fail to find Qt 6.1 or later due to the Qt tools having moved to
>   the libexec subdirectory, and tool names being suffixed with only the Qt major version number e.g. qmake6.
>
> And libcamera currently says
>
>   meson_version : '>= 0.60',
>
> Could this be an issue?
>

Oh yes, I will respin this to update Meson to 0.63. Thanks for catching that.



-- 
真実はいつも一つ！/ Always, there's only one truth!