CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qmake: fix example PACKAGECONCIG for qmake projects

Browse Source 
The default PACKAGECONFIG[examples] only works for cmake projects,
add correct arguments when using qmake projects. Skip QA check for
dev libs (.so) in example packages.

Pick-to: 6.1 6.0
Change-Id: I559395f3bfcb64d54e2f8ede4bbdf07c5aa617e9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2021-03-12 08:08:26 +02:00
parent a813c48901
commit 1933970950
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-qt/qt6/qt6.inc
View File

@ -3,6 +3,10 @@ inherit srcrev-update
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,"
PACKAGECONFIG[tests] = "-DQT_BUILD_TESTS=ON,-DQT_BUILD_TESTS=OFF,"
# For qmake projects
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', 'QT_BUILD_PARTS-=examples', d)}"
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', 'QT_BUILD_PARTS-=tests', d)}"
# If Qt6 (qtbase) is machine specific, then everything will be,
# because the (initial) qtbase configuration becomes part of Qt5/qmake
python __anonymous() {
@ -24,7 +28,7 @@ python __anonymous() {
# Many examples come with libraries installed outside of standard libdir,
# suppress QA check complaining
INSANE_SKIP_${PN}-dbg += "libdir"
INSANE_SKIP_${PN}-examples += "libdir"
INSANE_SKIP_${PN}-examples += "libdir dev-so"
SYSROOT_DIRS_append_mingw32 = " ${QT6_INSTALL_BINDIR}"