4 files changed, 60 insertions, 1 deletions
diff --git a/config.tests/unix/libinput_axis_api/libinput_axis_api.cpp b/config.tests/unix/libinput_axis_api/libinput_axis_api.cpp
new file mode 100644
index 0000000000..d469b8920e
--- /dev/null
+++ b/config.tests/unix/libinput_axis_api/libinput_axis_api.cpp
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <libinput.h>
+
+int main()
+{
+    libinput_event_pointer_has_axis(nullptr, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+    return 0;
+}
diff --git a/config.tests/unix/libinput_axis_api/libinput_axis_api.pro b/config.tests/unix/libinput_axis_api/libinput_axis_api.pro
new file mode 100644
index 0000000000..7221e62792
--- /dev/null
+++ b/config.tests/unix/libinput_axis_api/libinput_axis_api.pro
@@ -0,0 +1,2 @@
+SOURCES = libinput_axis_api.cpp
+CONFIG -= qt
diff --git a/src/gui/configure.json b/src/gui/configure.json
index d3e32e6796..d8969a1e4e 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -356,6 +356,12 @@
             "type": "compile",
             "test": "unix/evdev"
         },
+        "libinput_axis_api": {
+            "label": "axis API in libinput",
+            "type": "compile",
+            "test": "unix/libinput_axis_api",
+            "use": "libinput"
+        },
         "linuxfb": {
             "label": "LinuxFB",
             "type": "compile",
@@ -499,6 +505,11 @@
             "condition": "features.libudev && libs.libinput",
             "output": [ "privateFeature" ]
         },
+        "libinput-axis-api": {
+            "label": "axis API in libinput",
+            "condition": "tests.libinput_axis_api",
+            "output": [ "privateFeature" ]
+        },
         "lgmon": {
             "label": "lgmon",
             "emitIf": "config.qnx",
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;