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>

diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
index 48b512504f60c60fff40cd54bde2e63cf1137aeb..9eb5ef8375fb19a76a97de0fcdeffd77b2ec3af9 100644 (file)
--- 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 b51f5c5eedf849793c1e53bacd9c1d0b303cc639..c95f3b460c3e526ea6b63ac9624bc49445f66ea4 100644 (file)
--- 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