summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Aşıcı <fatih.asici@gmail.com>2013-09-18 07:23:32 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-09-18 10:25:52 (GMT)
commita252d6f4c7b9bc122d6461b3db3f703f5fe1aeea (patch)
tree5fc133205d14108a34abbf382bcf9f48da89fb1f
parent53722e54d08e31f007fa6a1682495eae725eccdf (diff)
downloadbuildroot-a252d6f4c7b9bc122d6461b3db3f703f5fe1aeea.tar.gz
buildroot-a252d6f4c7b9bc122d6461b3db3f703f5fe1aeea.tar.bz2
qt5webkit: select libXrender if xcb is enabled
[Peter: also add libXext] Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/qt5/qt5webkit/Config.in2
-rw-r--r--package/qt5/qt5webkit/qt5webkit.mk4
2 files changed, 6 insertions, 0 deletions
diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
index 48b5125..9eb5ef8 100644
--- a/package/qt5/qt5webkit/Config.in
+++ b/package/qt5/qt5webkit/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_QT5WEBKIT
select BR2_PACKAGE_QT5BASE_ICU
select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_SQLITE
+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
+ select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
# This module does not support static linking
depends on !BR2_PREFER_STATIC_LIB
help
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index b51f5c5..c95f3b4 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -21,6 +21,10 @@ QT5WEBKIT_LICENSE = Commercial license
QT5WEBKIT_REDISTRIBUTE = NO
endif
+ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
+QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
+endif
+
define QT5WEBKIT_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
endef