Merge branch 'master' into epel7

This commit is contained in:
Rex Dieter 2016-03-24 12:41:18 -05:00
commit 1279d84496
1 changed files with 1 additions and 1 deletions

View File

@ -4,7 +4,7 @@ if [ -z "$QT_XCB_FORCE_SOFTWARE_OPENGL" ]; then
QT5_CHECK_OPENGL_VERSION=`LANG=C glxinfo 2> /dev/null | grep '^OpenGL version string: ' | head -n 1 | sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g'` ||:
if [ "$QT5_CHECK_OPENGL_VERSION" == "1" -o "$QT5_CHECK_OPENGL_VERSION" == "0" ]; then
if [ "$QT5_CHECK_OPENGL_VERSION" == "1" ]; then
QT_XCB_FORCE_SOFTWARE_OPENGL=1
export QT_XCB_FORCE_SOFTWARE_OPENGL
fi