* [Buildroot] [PATCH] qt5webkit: install qml's only if declarative module is selected
@ 2013-09-18 8:01 Fatih Aşıcı
2013-09-18 10:27 ` Peter Korsgaard
0 siblings, 1 reply; 2+ messages in thread
From: Fatih Aşıcı @ 2013-09-18 8:01 UTC (permalink / raw)
To: buildroot
Fixes http://autobuild.buildroot.net/results/a9bbba68f22076ea2c86ee09ebe8a0a5e86b3b54/
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
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 5335d9e..7db4b02 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_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))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] qt5webkit: install qml's only if declarative module is selected
2013-09-18 8:01 [Buildroot] [PATCH] qt5webkit: install qml's only if declarative module is selected Fatih Aşıcı
@ 2013-09-18 10:27 ` Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2013-09-18 10:27 UTC (permalink / raw)
To: buildroot
>>>>> "Fatih" == Fatih A??c? <fatih.asici@gmail.com> writes:
Fatih> Fixes http://autobuild.buildroot.net/results/a9bbba68f22076ea2c86ee09ebe8a0a5e86b3b54/
Fatih> Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-18 10:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-18 8:01 [Buildroot] [PATCH] qt5webkit: install qml's only if declarative module is selected Fatih Aşıcı
2013-09-18 10:27 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox