From 8da88b098fae46e13cd7cbaf8d65dd0e99b4e0e5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 31 May 2019 14:49:58 +0300 Subject: Allow enabling gui for native and nativesdk Some Qt build tools may depend on QtGui, which need platform plugins for running them. Use minimal platform plugin since no interaction with the tool is expected. Add PACKAGECONFIGs that can be used to enable gui and image format plugins for the native and nativesdk builds. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 3c4f31cc..020ada23 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -66,6 +66,7 @@ FILES_${PN}-dev += " \ FILES_${PN} += " \ ${SDKPATHNATIVE}/environment-setup.d \ + ${OE_QMAKE_PATH_PLUGINS} \ " # qttools binaries are placed in a subdir of bin in order to avoid @@ -74,6 +75,10 @@ FILES_${PN} += " \ # disable package auto-renaming for the tools-package. DEBIAN_NOAUTONAME_${PN} = "1" +PACKAGECONFIG ?= "" +PACKAGECONFIG[gui] = "-gui -qpa minimal,-no-gui," +PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif," + QT_CONFIG_FLAGS += " \ -shared \ -silent \ @@ -102,12 +107,8 @@ do_configure() { -no-gcc-sysroot \ -system-zlib \ -dbus-runtime \ - -no-libjpeg \ - -no-libpng \ - -no-gif \ -no-accessibility \ -no-cups \ - -no-gui \ -no-sql-mysql \ -no-sql-sqlite \ -no-opengl \ @@ -149,7 +150,6 @@ do_install() { # remove things unused in nativesdk, we need the headers and libs rm -rf ${D}${datadir} \ - ${D}/${OE_QMAKE_PATH_PLUGINS} \ ${D}${libdir}/cmake \ ${D}${libdir}/pkgconfig -- cgit v1.2.3