summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@live.com>2013-03-26 09:40:47 -0500
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-26 21:44:15 +0100
commit87b3aa9f4fc5c96cee9e2b4c4fd03114af6fcc56 (patch)
tree00d00f3338725218f2ad0e5c5228c57f69453f8e
parentbb4e2e4faf76d4b2992231891a9d640cfdac5196 (diff)
Revert "eglfs: Disable eglfs when evdev is not present"
evdev support in eglfs is now guarded by QT_NO_EVDEV, so this check is no longer required. This allows eglfs + tslib to be a supported combination. This reverts commit a95e396a83930de14c6964dbf3724d6162d8400b. Change-Id: Icf7c15121b7eca1131d412b05b956cd5d7f189ae Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index a1ad4d7292..e7c478f536 100755
--- a/configure
+++ b/configure
@@ -5278,7 +5278,7 @@ elif [ "$CFG_OPENGL" = "desktop" ]; then
fi
if [ "$CFG_EGLFS" != "no" ]; then
- if [ "$CFG_OPENGL" = "es2" ] && [ "$CFG_EVDEV" = "yes" ]; then
+ if [ "$CFG_OPENGL" = "es2" ] && [ "$XPLATFORM_QNX" = "no" ]; then
CFG_EGLFS="$CFG_EGL"
else
CFG_EGLFS="no"