From e5ee1e036eaecb91797cbe85ac7f8929145f3d65 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 16 Dec 2016 15:06:49 -0800 Subject: Suppress the -Wfloat-equal warning qcamera.h:261:36: error: comparing floating point with == or != is unsafe [-Werror=float-equal] Task-number: QTBUG-57649 Change-Id: I15b62e0f9cec482fbb40fffd1490df20dda23c46 Reviewed-by: Yoann Lopes --- src/multimedia/camera/qcamera.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/multimedia/camera') diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 7d7063650..180760728 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -257,9 +257,15 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QCamera::LockTypes) +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wfloat-equal") +QT_WARNING_DISABLE_GCC("-Wfloat-equal") + Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator==(const QCamera::FrameRateRange &r1, const QCamera::FrameRateRange &r2) Q_DECL_NOTHROW { return r1.minimumFrameRate == r2.minimumFrameRate && r1.maximumFrameRate == r2.maximumFrameRate; } +QT_WARNING_POP + Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator!=(const QCamera::FrameRateRange &r1, const QCamera::FrameRateRange &r2) Q_DECL_NOTHROW { return !(r1 == r2); } -- cgit v1.2.1