diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-10-08 18:19:39 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-10-09 10:53:50 +0000 |
commit | fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f (patch) | |
tree | 2f82174d24708dab6a98ec89ac92e2f188ddfbbf /configure | |
parent | 2bbe1f998289cc553b2d6cffe570e3fdf5abaea9 (diff) |
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 <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -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" |