From: Fatih Aşıcı Date: Wed, 18 Sep 2013 08:01:03 +0000 (+0300) Subject: qt5webkit: install qml's only if declarative module is selected X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7816cc9ae624460fa0cccf50c1f0889b9d01151d;p=buildroot.git qt5webkit: install qml's only if declarative module is selected Fixes http://autobuild.buildroot.net/results/a9bbba68f22076ea2c86ee09ebe8a0a5e86b3b54/ Signed-off-by: Fatih Aşıcı Signed-off-by: Peter Korsgaard --- 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))