summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Bremer <wbremer@blackberry.com>2014-04-02 11:54:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-03 14:18:42 +0200
commitbfee43349f47ec948b7e25165d76af45bb0ec588 (patch)
tree06af346a8950f06fcf1c1a33b527b8f52f62ba55
parent581d10bdf26dacaa36a916744ff5b43ecaa05f77 (diff)
Fixes related to evdev in the configure script
This adds evdev to the help, configure status output and will include it in the qconfig.h. Change-Id: Ibc07516ab07e7c53ec89b167d604f5cefa2d92b7 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rwxr-xr-xconfigure5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index 72679947be..01c00964ef 100755
--- a/configure
+++ b/configure
@@ -2416,6 +2416,9 @@ Additional options:
-no-iconv .......... Do not compile support for iconv(3).
* -iconv ............. Compile support for iconv(3).
+ -no-evdev .......... Do not compile support for evdev.
+ * -evdev ............. Compile support for evdev.
+
-no-icu ............ Do not compile support for ICU libraries.
+ -icu ............... Compile support for ICU libraries.
@@ -6045,6 +6048,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
# X11/Unix/Mac only configs
[ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
[ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV"
+[ "$CFG_EVDEV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EVDEV"
[ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB"
[ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK"
[ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC"
@@ -6464,6 +6468,7 @@ report_support " ALSA ..................." "$CFG_ALSA"
report_support " CUPS ..................." "$CFG_CUPS"
[ "$XPLATFORM_MINGW" = "yes" ] && \
report_support " DirectWrite ............" "$CFG_DIRECTWRITE"
+report_support " Evdev .................." "$CFG_EVDEV"
report_support " FontConfig ............." "$CFG_FONTCONFIG"
report_support " FreeType ..............." "$CFG_FREETYPE" system "system library" yes "bundled copy"
report_support " Glib ..................." "$CFG_GLIB"