[libcamera-devel] [PATCH] qcam: Support Qt versions earlier than 5.9

Niklas Söderlund niklas.soderlund at ragnatech.se
Thu Oct 17 01:23:21 CEST 2019


Hi Laurent,

Thanks for your patch.

On 2019-10-17 02:20:18 +0300, Laurent Pinchart wrote:
> The QtEventDispatcher timers implementation depends on Qt 5.9 or newer
> due to the use of QObject::startTimer(std::chrono::milliseconds).
> Support earlier Qt versions by using the QObject::startTimer(int)
> version instead.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

This fixes the problem I ran into on gcc 6.3.0.

Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>

> ---
>  src/qcam/qt_event_dispatcher.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp
> index 9e989bef7d53..2780c9123ac3 100644
> --- a/src/qcam/qt_event_dispatcher.cpp
> +++ b/src/qcam/qt_event_dispatcher.cpp
> @@ -117,7 +117,7 @@ void QtEventDispatcher::registerTimer(Timer *timer)
>  	std::chrono::steady_clock::duration duration = timer->deadline() - now;
>  	std::chrono::milliseconds msec =
>  		std::chrono::duration_cast<std::chrono::milliseconds>(duration);
> -	int timerId = startTimer(msec);
> +	int timerId = startTimer(msec.count());
>  	timers_[timerId] = timer;
>  	timerIds_[timer] = timerId;
>  }
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

-- 
Regards,
Niklas Söderlund


More information about the libcamera-devel mailing list