diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
| commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
| tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/multimedia/camera | |
| parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
| parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcamera.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 9d3d26b0e..685298905 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); } |