1c186c6ca1
Commite482ebf51dattempted to fix the installation of qt5quickcontrols by only installing the PrivateWidgets directory for the 5.8.0 version. However, the availability of PrivateWidgets has nothing to do with the version; in both 5.6.2 and 5.8.0, the installation is gated by the following statement in src/src.pro: qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += widgets i.e. it is installed when both the Quick and the Widgets module are available. The Widgets module is controlled by Buildroot's BR2_PACKAGE_QT5BASE_WIDGETS symbol, the Quick module is controlled by Buildroot's BR2_PACKAGE_QT5DECLARATIVE_QUICK. The qt5quickcontrols package selects BR2_PACKAGE_QT5DECLARATIVE_QUICK so it is not really needed to include it in the condition. However, it is theoretically possible to build this package without QtQuick. Also, adding this condition makes it consistent with src.pro. Note that commite482ebf51dintroduces a second fix (not mentioned in the commit message): for version 5.6.2, the Layouts directory is installed, but in 5.8.0 this directory doesn't exist any more. Therefore, a separate condition on the version is still needed. Fixes: http://autobuild.buildroot.net/results/1ff3e9ad4ba518d0a37f9fc12038bf9020f28094 Cc: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
55 lines
1.8 KiB
Makefile
55 lines
1.8 KiB
Makefile
################################################################################
|
|
#
|
|
# qt5quickcontrols
|
|
#
|
|
################################################################################
|
|
|
|
QT5QUICKCONTROLS_VERSION = $(QT5_VERSION)
|
|
QT5QUICKCONTROLS_SITE = $(QT5_SITE)
|
|
QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERSION).tar.xz
|
|
QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
|
|
QT5QUICKCONTROLS_INSTALL_STAGING = YES
|
|
|
|
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
|
|
QT5QUICKCONTROLS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
|
|
QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
|
|
else
|
|
QT5QUICKCONTROLS_LICENSE = Commercial license
|
|
QT5QUICKCONTROLS_REDISTRIBUTE = NO
|
|
endif
|
|
|
|
define QT5QUICKCONTROLS_CONFIGURE_CMDS
|
|
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
|
|
endef
|
|
|
|
define QT5QUICKCONTROLS_BUILD_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
|
endef
|
|
|
|
define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
|
endef
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy)
|
|
define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS
|
|
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
|
|
endef
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
|
define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS
|
|
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
|
|
endef
|
|
endif
|
|
|
|
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
|
|
$(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS)
|
|
$(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS)
|
|
endef
|
|
|
|
$(eval $(generic-package))
|