qt5webkit: install qml's only if declarative module is selected
authorFatih Aşıcı <fatih.asici@gmail.com>
Wed, 18 Sep 2013 08:01:03 +0000 (11:01 +0300)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 18 Sep 2013 10:26:17 +0000 (12:26 +0200)
Fixes http://autobuild.buildroot.net/results/a9bbba68f22076ea2c86ee09ebe8a0a5e86b3b54/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/qt5/qt5webkit/qt5webkit.mk

index c95f3b460c3e526ea6b63ac9624bc49445f66ea4..320a2ea3c7d6002d2efff508a055233e1cb91b20 100644 (file)
@@ -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))