| Message ID | 1379489012-21883-1-git-send-email-fatih.asici@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
>>>>> "Fatih" == Fatih Aşıcı <fatih.asici@gmail.com> writes:
Fatih> Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Fatih> ---
Fatih> package/qt5/qt5webkit/Config.in | 1 +
Fatih> package/qt5/qt5webkit/qt5webkit.mk | 4 ++++
Fatih> 2 files changed, 5 insertions(+)
Fatih> diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
Fatih> index 48b5125..ba051d6 100644
Fatih> --- a/package/qt5/qt5webkit/Config.in
Fatih> +++ b/package/qt5/qt5webkit/Config.in
Fatih> @@ -4,6 +4,7 @@ config BR2_PACKAGE_QT5WEBKIT
Fatih> select BR2_PACKAGE_QT5BASE_ICU
Fatih> select BR2_PACKAGE_QT5BASE_GUI
Fatih> select BR2_PACKAGE_SQLITE
Fatih> + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
It also needs libXext. Committed with that fixed, thanks.
diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 48b5125..ba051d6 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_SQLITE + 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..5335d9e 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_libXrender +endif + define QT5WEBKIT_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> --- package/qt5/qt5webkit/Config.in | 1 + package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 2 files changed, 5 insertions(+)