From cbac31ee9090e3e0e1c81b7e1458410deece1331 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 31 Jan 2022 13:41:47 +0000 Subject: [PATCH] qt6-cmake: inherit pkgconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Static build needs pkgconfig for every Qt module. Include it already in qt6-cmake class instead of in each individual module. Pick-to: 6.3 6.2 Change-Id: I065382ee49d6b40b76ede9e632d17221451de8d1 Reviewed-by: Pasi Petäjäjärvi --- classes/qt6-cmake.bbclass | 2 +- recipes-qt/qt6/qtbase_git.bb | 2 +- recipes-qt/qt6/qtconnectivity_git.bb | 2 +- recipes-qt/qt6/qtinterfaceframework_git.bb | 2 +- recipes-qt/qt6/qtmultimedia_git.bb | 2 +- recipes-qt/qt6/qtsensors_git.bb | 2 +- recipes-qt/qt6/qtserialport_git.bb | 2 +- recipes-qt/qt6/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt6/qtwayland_git.bb | 2 +- recipes-qt/qt6/qtwebengine.inc | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/classes/qt6-cmake.bbclass b/classes/qt6-cmake.bbclass index 918122f..447dab5 100644 --- a/classes/qt6-cmake.bbclass +++ b/classes/qt6-cmake.bbclass @@ -1,4 +1,4 @@ -inherit cmake python3native perlnative qt6-paths +inherit cmake python3native perlnative pkgconfig qt6-paths DEPENDS:prepend = "qtbase-native " diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 0552bf2..c436368 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.QT-LICENSE-AGREEMENT;md5=f383149f021dd9099dd49628e3916808 \ " -inherit qt6-cmake pkgconfig +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb index ab6ac10..51b17da 100644 --- a/recipes-qt/qt6/qtconnectivity_git.bb +++ b/recipes-qt/qt6/qtconnectivity_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -inherit qt6-cmake pkgconfig +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtinterfaceframework_git.bb b/recipes-qt/qt6/qtinterfaceframework_git.bb index 4501326..433de8a 100644 --- a/recipes-qt/qt6/qtinterfaceframework_git.bb +++ b/recipes-qt/qt6/qtinterfaceframework_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -inherit qt6-cmake pkgconfig +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtmultimedia_git.bb b/recipes-qt/qt6/qtmultimedia_git.bb index 6d77955..764290a 100644 --- a/recipes-qt/qt6/qtmultimedia_git.bb +++ b/recipes-qt/qt6/qtmultimedia_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -inherit qt6-cmake pkgconfig +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtsensors_git.bb b/recipes-qt/qt6/qtsensors_git.bb index 28b6fc3..89df659 100644 --- a/recipes-qt/qt6/qtsensors_git.bb +++ b/recipes-qt/qt6/qtsensors_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -inherit qt6-cmake pkgconfig +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtserialport_git.bb b/recipes-qt/qt6/qtserialport_git.bb index b1d2504..1fe3356 100644 --- a/recipes-qt/qt6/qtserialport_git.bb +++ b/recipes-qt/qt6/qtserialport_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -inherit qt6-cmake pkgconfig +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb index ec0ac8e..499fe3c 100644 --- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ " -inherit qt6-cmake pkgconfig +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index fe852aa..350ba0a 100644 --- a/recipes-qt/qt6/qtwayland_git.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -inherit qt6-cmake pkgconfig +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index a7f0a69..c69caeb 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -inherit qt6-cmake pkgconfig +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc