From b80efa327a98aa9e5f821ac55d459c01400b151a Mon Sep 17 00:00:00 2001 From: Naumann Andreas Date: Tue, 31 Jan 2017 08:59:08 +0100 Subject: [PATCH] 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 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index b33ff1575e..c2946bc753 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)) -- 2.30.2