From 7816cc9ae624460fa0cccf50c1f0889b9d01151d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Wed, 18 Sep 2013 11:01:03 +0300 Subject: [PATCH] qt5webkit: install qml's only if declarative module is selected MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes http://autobuild.buildroot.net/results/a9bbba68f22076ea2c86ee09ebe8a0a5e86b3b54/ Signed-off-by: Fatih Aşıcı Signed-off-by: Peter Korsgaard --- package/qt5/qt5webkit/qt5webkit.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index c95f3b460c..320a2ea3c7 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -25,6 +25,10 @@ ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender endif +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5WEBKIT_DEPENDENCIES += qt5declarative +endif + define QT5WEBKIT_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef @@ -38,10 +42,16 @@ define QT5WEBKIT_INSTALL_STAGING_CMDS $(QT5_LA_PRL_FILES_FIXUP) endef +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +define QT5WEBKIT_INSTALL_TARGET_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/ +endef +endif + define QT5WEBKIT_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/ + $(QT5WEBKIT_INSTALL_TARGET_QMLS) endef $(eval $(generic-package)) -- 2.30.2