From b4085e56b9040247393b279f64b8cd63af863798 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 6 Oct 2016 14:51:36 +0200 Subject: Migrate libinput support away from QT_LIBRARY_VERSION There may not be a version when libinput is not picked up via pkg-config. Add a config test instead. Task-number: QTBUG-56017 Change-Id: I421af4cef1b896413a4ebda561809a8b2a3386b3 Reviewed-by: Oswald Buddenhagen --- src/platformsupport/input/libinput/qlibinputpointer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/platformsupport/input') diff --git a/src/platformsupport/input/libinput/qlibinputpointer.cpp b/src/platformsupport/input/libinput/qlibinputpointer.cpp index 3b583ec99d..bdeac8db7e 100644 --- a/src/platformsupport/input/libinput/qlibinputpointer.cpp +++ b/src/platformsupport/input/libinput/qlibinputpointer.cpp @@ -96,7 +96,7 @@ void QLibInputPointer::processMotion(libinput_event_pointer *e) void QLibInputPointer::processAxis(libinput_event_pointer *e) { -#if QT_LIBRARY_VERSION(libinput) < QT_VERSION_CHECK(0, 8, 0) +#if !QT_CONFIG(libinput_axis_api) const double v = libinput_event_pointer_get_axis_value(e) * 120; const Qt::Orientation ori = libinput_event_pointer_get_axis(e) == LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL ? Qt::Vertical : Qt::Horizontal; -- cgit v1.2.3