diff options
| -rw-r--r-- | config.tests/x11/xinput/xinput.cpp | 51 | ||||
| -rw-r--r-- | config.tests/x11/xinput/xinput.pro | 6 | ||||
| -rwxr-xr-x | configure | 12 |
3 files changed, 0 insertions, 69 deletions
diff --git a/config.tests/x11/xinput/xinput.cpp b/config.tests/x11/xinput/xinput.cpp deleted file mode 100644 index 1d717c0125..0000000000 --- a/config.tests/x11/xinput/xinput.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the config.tests of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifdef Q_OS_SOLARIS -#error "Not supported." -#else - -#include <X11/Xlib.h> -#include <X11/extensions/XInput.h> - -#ifdef Q_OS_IRIX -# include <wacom.h> -#endif - -int main(int, char **) -{ - XDeviceButtonEvent *event; - event = 0; - return 0; -} -#endif diff --git a/config.tests/x11/xinput/xinput.pro b/config.tests/x11/xinput/xinput.pro deleted file mode 100644 index 8acaede355..0000000000 --- a/config.tests/x11/xinput/xinput.pro +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES = xinput.cpp -CONFIG += x11 -CONFIG -= qt -LIBS += -lXi -irix-*:DEFINES+=Q_OS_IRIX -solaris-*:DEFINES+=Q_OS_SOLARIS @@ -675,7 +675,6 @@ OPT_OBSOLETE_HOST_ARG=no CFG_USE_GNUMAKE=no CFG_XINPUT2=auto -CFG_XINPUT=runtime CFG_XKB=auto CFG_XKBCOMMON=yes CFG_XKBCOMMON_EVDEV=auto @@ -1556,13 +1555,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - xinput) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then - CFG_XINPUT="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; egl) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_EGL="$VAL" @@ -5515,7 +5507,6 @@ if [ "$CFG_XINPUT2" != "no" ]; then QMakeVar set QMAKE_LIBXI_VERSION_PATCH "$QMAKE_LIBXI_VERSION_PATCH" fi CFG_XINPUT2=yes - CFG_XINPUT=no else if [ "$CFG_XINPUT2" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then echo "XInput2 support cannot be enabled due to functionality tests!" @@ -6834,13 +6825,11 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE" [ "$CFG_XVIDEO" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XVIDEO" [ "$CFG_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" -[ "$CFG_XINPUT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET" [ "$CFG_XCURSOR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XCURSOR" [ "$CFG_XINERAMA" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINERAMA" [ "$CFG_XFIXES" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XFIXES" [ "$CFG_XRANDR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XRANDR" -[ "$CFG_XINPUT" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINPUT" [ "$CFG_ALSA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA" [ "$CFG_PULSEAUDIO" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PULSEAUDIO" [ "$CFG_COREWLAN" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN" @@ -7302,7 +7291,6 @@ if [ "$CFG_XCB" != "no" ]; then report_support " Xcb-Xlib ..........." "$CFG_XCB_XLIB" report_support " Xcursor ............" "$CFG_XCURSOR" runtime "loaded at runtime" report_support " Xfixes ............." "$CFG_XFIXES" runtime "loaded at runtime" - report_support " Xi ................." "$CFG_XINPUT" runtime "loaded at runtime" report_support " Xi2 ................" "$CFG_XINPUT2" runtime "loaded at runtime" report_support " Xinerama ..........." "$CFG_XINERAMA" runtime "loaded at runtime" report_support " Xrandr ............." "$CFG_XRANDR" runtime "loaded at runtime" |