From fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Thu, 8 Oct 2015 18:19:39 +0300 Subject: configure: Remove -xinput option It's obsolete since e6a7a6a381c0b61a93a642b425ecbcd714fd1c29 (Remove xlib plugin) and a2337f79ffd229aa1e91f6bfec6294570eb3fe44 (Remove Windows and X11 from src/widgets/platforms). The actual option is -xinput2. Change-Id: I28bf03963a8edc5c69330605ba072fbfaefb05e3 Reviewed-by: Oswald Buddenhagen --- config.tests/x11/xinput/xinput.cpp | 51 -------------------------------------- config.tests/x11/xinput/xinput.pro | 6 ----- 2 files changed, 57 deletions(-) delete mode 100644 config.tests/x11/xinput/xinput.cpp delete mode 100644 config.tests/x11/xinput/xinput.pro (limited to 'config.tests') 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 -#include - -#ifdef Q_OS_IRIX -# include -#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 -- cgit v1.2.3