summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaumann Andreas <ANaumann@ultratronik.de>2017-01-31 08:59:08 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-02-07 17:46:48 +0100
commitb80efa327a98aa9e5f821ac55d459c01400b151a (patch)
tree6583e355ef6b90c8f2edd0b419ec2203c83f7a35
parent080434f10e5b731ce11ea61a569589fb9f4a5493 (diff)
qt5quickcontrols: More deterministic target install
Restrict target install to quickcontrols(1) qmls only. Installing everything under qml/QtQuick includes e.g. quickcontrols2 if existent in staging (but not selected). Another issue may arise e.g. for a external package that creates more files than it installs itself under qml/QtQuick. In that case, it would depend on the order of the packages how much gets installed into target. Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/qt5/qt5quickcontrols/qt5quickcontrols.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index b33ff1575..c2946bc75 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -31,7 +31,10 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
endef
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
- cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
+ cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
+ cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
+ cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
+ cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
endef
$(eval $(generic-package))