blob: 387961b416f112a5f40e22593ff452e6131cca12 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
From 665841d6c38faecbf7848c0f4bbf3b0537b6a0a1 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@live.com>
Date: Tue, 26 Mar 2013 09:22:51 -0500
Subject: [PATCH 16/16] Allow tslib to be specified at configure time.
Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
configure | 20 ++++++++++++++++++++
src/plugins/generic/generic.pro | 4 ++++
2 files changed, 24 insertions(+)
diff --git a/configure b/configure
index ac09bbf..188e941 100755
--- a/configure
+++ b/configure
@@ -829,6 +829,7 @@ CFG_KMS=auto
CFG_LIBUDEV=auto
CFG_OBSOLETE_WAYLAND=no
CFG_EVDEV=auto
+CFG_TSLIB=no
CFG_NIS=auto
CFG_CUPS=auto
CFG_ICONV=auto
@@ -1805,6 +1806,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ tslib)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_TSLIB="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
cups)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_CUPS="$VAL"
@@ -4815,6 +4823,18 @@ if [ "$CFG_EVDEV" = "no" ]; then
QMakeVar add DEFINES QT_NO_EVDEV
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 :-)
if compileTest x11/xlib "XLib"; then
QT_CONFIG="$QT_CONFIG xlib"
diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro
index 078db2f..18a8295 100644
--- a/src/plugins/generic/generic.pro
+++ b/src/plugins/generic/generic.pro
@@ -5,3 +5,7 @@ TEMPLATE = subdirs
contains(QT_CONFIG, evdev) {
SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet
}
+
+contains(QT_CONFIG, tslib) {
+ SUBDIRS += tslib
+}
--
1.8.2.1
|
