summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorTomasz Olszak <olszak.tomasz@gmail.com>2015-11-10 15:42:03 +0100
committerTomasz Olszak <olszak.tomasz@gmail.com>2015-11-10 15:42:03 +0100
commit0ad5acb684f8ba3f62fa2a2bb39c14e54b08d2e3 (patch)
treed39bfe5f5a9f0165992ec1aa3530e0b167b22031 /configure
parentdba4e21673bb403036ee5faa05091234d5f0ee83 (diff)
downloadqtbase-0ad5acb684f8ba3f62fa2a2bb39c14e54b08d2e3.tar.gz
qtbase-0ad5acb684f8ba3f62fa2a2bb39c14e54b08d2e3.tar.bz2
qtbase-0ad5acb684f8ba3f62fa2a2bb39c14e54b08d2e3.zip
Added -force-eglx option to configure script.
Tizen mobile 2.2* has broken eglplatform.h header so that eglx test does not pass. eglplatform.h does not contains MESA_EGL_NO_X11_HEADERS ifdef. Change-Id: I8f956051f2145a60a0f6e429230a9d731c8c2dc0 Bug-Tizen: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 9 insertions, 1 deletions
diff --git a/configure b/configure
index 8e8680b472..7ec0d4f25a 100755
--- a/configure
+++ b/configure
@@ -644,6 +644,7 @@ CFG_OPENVG_SHIVA=auto
CFG_OPENVG_ON_OPENGL=auto
CFG_EGL=auto
CFG_EGL_X=auto
+CFG_FORCE_EGL_X=no
CFG_FONTCONFIG=auto
CFG_FREETYPE=auto
CFG_HARFBUZZ=qt
@@ -1586,6 +1587,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ force-eglx)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_FORCE_EGL_X=yes
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
pch)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PRECOMPILE="$VAL"
@@ -5676,7 +5684,7 @@ if [ "$CFG_EGL" != "no" ]; then
fi # detect EGL support
if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
CFG_EGL=yes
- if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
+ if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL || [ "$CFG_FORCE_EGL_X" == "yes" ]; then
CFG_EGL_X=yes
else
CFG_EGL_X=no