[Buildroot] [PATCH v1] qt5quickcontrols: fix LTS (5.6) qml file install
Peter Korsgaard
peter at korsgaard.com
Mon Feb 20 22:37:00 UTC 2017
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni at free-electrons.com> writes:
> Hello,
> On Mon, 20 Feb 2017 22:41:05 +0100, Peter Seiderer wrote:
>> +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
>> define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
>> 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
>> +else
>> +define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
>> + 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/Layouts $(TARGET_DIR)/usr/qml/QtQuick
>> +endef
>> +endif
> Perhaps it's time to:
> ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
> QT5QUICKCONTROLS_INSTALL_QML_DIRS = Controls Dialogs Extras PrivateWidgets
> else
> QT5QUICKCONTROLS_INSTALL_QML_DIRS = Controls Dialogs Extras Layouts
> endif
> define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
> $(foreach d,$(QT5QUICKCONTROLS_INSTALL_QML_DIRS), \
> cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/$(d) $(TARGET_DIR)/usr/qml/QtQuick
> )
> endef
Yeah, I also didn't really like the repeated lines - But this way is
atleast very minimal/safe.
Alternatively the loop could be extended to check if the directory
exists and otherwise skip it, then we wouldn't need the version check.
--
Bye, Peter Korsgaard
More information about the buildroot
mailing list