AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow tslib to be specified at configure time.

Browse Source 
Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Michael Brasser 2013-03-26 09:22:51 -05:00 committed by The Qt Project
parent bafd3fdf1c
commit bb4e2e4faf
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@ -885,6 +885,7 @@ CFG_KMS=auto
CFG_LIBUDEV=auto CFG_LIBUDEV=auto
CFG_OBSOLETE_WAYLAND=no CFG_OBSOLETE_WAYLAND=no
CFG_EVDEV=auto CFG_EVDEV=auto
CFG_TSLIB=no
CFG_NIS=auto CFG_NIS=auto
CFG_CUPS=auto CFG_CUPS=auto
CFG_ICONV=auto CFG_ICONV=auto
@ -1867,6 +1868,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes UNKNOWN_OPT=yes
fi fi
;; ;;
tslib)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_TSLIB="$VAL"
else
UNKNOWN_OPT=yes
fi
;;
cups) cups)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_CUPS="$VAL" CFG_CUPS="$VAL"
@ -5071,6 +5079,18 @@ if [ "$CFG_EVDEV" = "no" ]; then
QMakeVar add DEFINES QT_NO_EVDEV QMakeVar add DEFINES QT_NO_EVDEV
fi fi
if [ "$CFG_TSLIB" != "no" ]; then
if compileTest unix/tslib "tslib"; then
CFG_TSLIB=yes
QT_CONFIG="$QT_CONFIG tslib"
elif [ "$CFG_TSLIB" = "yes" ]; then
echo "The tslib functionality test failed!"
exit 1
else
CFG_TSLIB=no
fi
fi
# Check we actually have X11 :-) # Check we actually have X11 :-)
if compileTest x11/xlib "XLib"; then if compileTest x11/xlib "XLib"; then
QT_CONFIG="$QT_CONFIG xlib" QT_CONFIG="$QT_CONFIG xlib"

4
src/plugins/generic/generic.pro
View File

@ -5,3 +5,7 @@ TEMPLATE = subdirs
contains(QT_CONFIG, evdev) { contains(QT_CONFIG, evdev) {
SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet
} }
contains(QT_CONFIG, tslib) {
SUBDIRS += tslib
}