summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch')
-rw-r--r--recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch72
1 files changed, 72 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch
new file mode 100644
index 00000000..387961b4
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch
@@ -0,0 +1,72 @@
1From 665841d6c38faecbf7848c0f4bbf3b0537b6a0a1 Mon Sep 17 00:00:00 2001
2From: Michael Brasser <michael.brasser@live.com>
3Date: Tue, 26 Mar 2013 09:22:51 -0500
4Subject: [PATCH 16/16] Allow tslib to be specified at configure time.
5
6Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e
7Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
8---
9 configure | 20 ++++++++++++++++++++
10 src/plugins/generic/generic.pro | 4 ++++
11 2 files changed, 24 insertions(+)
12
13diff --git a/configure b/configure
14index ac09bbf..188e941 100755
15--- a/configure
16+++ b/configure
17@@ -829,6 +829,7 @@ CFG_KMS=auto
18 CFG_LIBUDEV=auto
19 CFG_OBSOLETE_WAYLAND=no
20 CFG_EVDEV=auto
21+CFG_TSLIB=no
22 CFG_NIS=auto
23 CFG_CUPS=auto
24 CFG_ICONV=auto
25@@ -1805,6 +1806,13 @@ while [ "$#" -gt 0 ]; do
26 UNKNOWN_OPT=yes
27 fi
28 ;;
29+ tslib)
30+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
31+ CFG_TSLIB="$VAL"
32+ else
33+ UNKNOWN_OPT=yes
34+ fi
35+ ;;
36 cups)
37 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
38 CFG_CUPS="$VAL"
39@@ -4815,6 +4823,18 @@ if [ "$CFG_EVDEV" = "no" ]; then
40 QMakeVar add DEFINES QT_NO_EVDEV
41 fi
42
43+if [ "$CFG_TSLIB" != "no" ]; then
44+ if compileTest unix/tslib "tslib"; then
45+ CFG_TSLIB=yes
46+ QT_CONFIG="$QT_CONFIG tslib"
47+ elif [ "$CFG_TSLIB" = "yes" ]; then
48+ echo "The tslib functionality test failed!"
49+ exit 1
50+ else
51+ CFG_TSLIB=no
52+ fi
53+fi
54+
55 # Check we actually have X11 :-)
56 if compileTest x11/xlib "XLib"; then
57 QT_CONFIG="$QT_CONFIG xlib"
58diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro
59index 078db2f..18a8295 100644
60--- a/src/plugins/generic/generic.pro
61+++ b/src/plugins/generic/generic.pro
62@@ -5,3 +5,7 @@ TEMPLATE = subdirs
63 contains(QT_CONFIG, evdev) {
64 SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet
65 }
66+
67+contains(QT_CONFIG, tslib) {
68+ SUBDIRS += tslib
69+}
70--
711.8.2.1
72