diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-10-13 18:43:25 +0300 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-10-14 09:30:21 +0000 |
| commit | e824abd987d77efaa085fe1f9fb514d270798d55 (patch) | |
| tree | be393ba101334f16a756f87370a4d68dd494d97e /configure | |
| parent | f0a559f1c8dcf4b78c11853316919783823ded7a (diff) | |
configure: Remove unused options -xvideo and -xinerama
-xvideo was not used even by Qt 4 for a long time.
-xinerama was used by the xlib plugin which was dropped
by e6a7a6a381c0b61a93a642b425ecbcd714fd1c29.
Change-Id: Iea97f643570d98f84ad1ce6f16e911dc92d617b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 21 |
1 files changed, 0 insertions, 21 deletions
@@ -615,8 +615,6 @@ CFG_SHARED=yes CFG_SM=auto CFG_XSHAPE=auto CFG_XSYNC=auto -CFG_XVIDEO=auto -CFG_XINERAMA=runtime CFG_XFIXES=runtime CFG_ZLIB=auto CFG_MTDEV=auto @@ -1520,13 +1518,6 @@ while [ "$#" -gt 0 ]; do fi ;; - xinerama) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then - CFG_XINERAMA="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; xshape) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_XSHAPE="$VAL" @@ -1534,13 +1525,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - xvideo) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_XVIDEO="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; xsync) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_XSYNC="$VAL" @@ -6817,17 +6801,14 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_XCURSOR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XCURSOR" [ "$CFG_XFIXES" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XFIXES" [ "$CFG_FONTCONFIG" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FONTCONFIG" -[ "$CFG_XINERAMA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINERAMA" [ "$CFG_XKB" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XKB" [ "$CFG_XRANDR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRANDR" [ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER" [ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM" [ "$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_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_ALSA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA" @@ -7292,13 +7273,11 @@ if [ "$CFG_XCB" != "no" ]; then report_support " Xcursor ............" "$CFG_XCURSOR" runtime "loaded at runtime" report_support " Xfixes ............." "$CFG_XFIXES" 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" report_support " Xrender ............" "$CFG_XRENDER" report_support " XKB ................" "$CFG_XKB" report_support " XShape ............." "$CFG_XSHAPE" report_support " XSync .............." "$CFG_XSYNC" - report_support " XVideo ............." "$CFG_XVIDEO" fi report_support " Session management ....." "$CFG_SM" if [ "$XPLATFORM_QNX" = "yes" ]; then |