diff options
Diffstat (limited to 'recipes/qt4/qt4-x11-free.inc')
| -rw-r--r-- | recipes/qt4/qt4-x11-free.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index 23fa33f118..6ca20561cd 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -6,7 +6,7 @@ LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -INC_PR = "r10" +INC_PR = "r12" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ @@ -16,13 +16,14 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz file://0006-freetype-host-includes.patch;patch=1 \ file://0007-openssl-host-includes.patch;patch=1 \ file://0008-qt-lib-infix.patch;patch=1 \ + file://fix-config-tests.patch;patch=1 \ file://g++.conf \ file://linux.conf \ " S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - -QT_CONFIG_FLAGS += "-no-xinerama -no-xkb -no-opengl" +QT_GLFLAGS ?= "-no-opengl" +QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" QT_BASE_NAME = "qt4" QT_BASE_LIB = "libqt" QT_DIR_NAME = "qt4" |