qt5quickcontrols: fix LTS (5.6) qml file install
authorPeter Seiderer <ps.report@gmx.net>
Mon, 20 Feb 2017 21:41:05 +0000 (22:41 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 20 Feb 2017 22:31:27 +0000 (23:31 +0100)
Fixes #9666 [1]

  cp -dpfr .../host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/qml/QtQuick/PrivateWidgets .../target/usr/qml/QtQuick
  cp: cannot stat â€˜.../host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/qml/QtQuick/PrivateWidgets’: No such file or directory

[1] https://bugs.busybox.net/show_bug.cgi?id=9666

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/qt5/qt5quickcontrols/qt5quickcontrols.mk

index c2946bc753bf5e1b0a7865c63e71cae39d64843e..8a63629c3533ad05ea7e534ed29d6887552c4edb 100644 (file)
@@ -30,11 +30,20 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
+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
 
 $(eval $(generic-package))