NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

qcam: Drop Qt version checks

Browse source 
The Qt version checks to support different minor Qt5 versions are not
needed anymore, now that we switched to Qt6. Drop them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Neal Gompa <neal@gompa.dev>
This commit is contained in:
Laurent Pinchart 2024-09-09 16:13:20 +03:00
parent 13645ab0ab
commit e5fd3bea77
2 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/apps/qcam/main_window.cpp
View file

@ -37,16 +37,6 @@
using namespace libcamera; using namespace libcamera;
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
/*
* Qt::fixed was introduced in v5.14, and ::fixed deprecated in v5.15. Allow
* usage of Qt::fixed unconditionally.
*/
namespace Qt {
constexpr auto fixed = ::fixed;
} /* namespace Qt */
#endif
/** /**
* \brief Custom QEvent to signal capture completion * \brief Custom QEvent to signal capture completion
*/ */

4
src/apps/qcam/viewfinder_qt.cpp
View file

@ -27,15 +27,11 @@
static const QMap<libcamera::PixelFormat, QImage::Format> nativeFormats static const QMap<libcamera::PixelFormat, QImage::Format> nativeFormats
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
{ libcamera::formats::ABGR8888, QImage::Format_RGBX8888 }, { libcamera::formats::ABGR8888, QImage::Format_RGBX8888 },
{ libcamera::formats::XBGR8888, QImage::Format_RGBX8888 }, { libcamera::formats::XBGR8888, QImage::Format_RGBX8888 },
#endif
{ libcamera::formats::ARGB8888, QImage::Format_RGB32 }, { libcamera::formats::ARGB8888, QImage::Format_RGB32 },
{ libcamera::formats::XRGB8888, QImage::Format_RGB32 }, { libcamera::formats::XRGB8888, QImage::Format_RGB32 },
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
{ libcamera::formats::RGB888, QImage::Format_BGR888 }, { libcamera::formats::RGB888, QImage::Format_BGR888 },
#endif
{ libcamera::formats::BGR888, QImage::Format_RGB888 }, { libcamera::formats::BGR888, QImage::Format_RGB888 },
{ libcamera::formats::RGB565, QImage::Format_RGB16 }, { libcamera::formats::RGB565, QImage::Format_RGB16 },
}; };