AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate libinput support away from QT_LIBRARY_VERSION

Browse Source 
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 <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Laszlo Agocs 2016-10-06 14:51:36 +02:00 committed by Oswald Buddenhagen
parent 573fbd84a4
commit b4085e56b9
4 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
config.tests/unix/libinput_axis_api/libinput_axis_api.cpp Normal file
View File

@ -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;
}

2
config.tests/unix/libinput_axis_api/libinput_axis_api.pro Normal file
View File

@ -0,0 +1,2 @@
SOURCES = libinput_axis_api.cpp
CONFIG -= qt

11
src/gui/configure.json
View File

@ -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",

2
src/platformsupport/input/libinput/qlibinputpointer.cpp
View File

@ -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;