diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-03-12 08:08:26 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-12 10:15:25 +0000 |
| commit | ed26c8d8b44df97d533c3a9da0d81b4a398b58d0 (patch) | |
| tree | cd827a2fd04a7ddb7e3c0fcbd3b138fba5544a33 | |
| parent | 37497918aa99c1dc779cd33db1a89bcf88e92608 (diff) | |
qmake: fix example PACKAGECONCIG for qmake projects
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.
Change-Id: I559395f3bfcb64d54e2f8ede4bbdf07c5aa617e9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 1933970950be0157f25295dded1d10a02b2dd5f9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | recipes-qt/qt6/qt6.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes-qt/qt6/qt6.inc b/recipes-qt/qt6/qt6.inc index fe473ce..64cf6a4 100644 --- a/recipes-qt/qt6/qt6.inc +++ b/recipes-qt/qt6/qt6.inc @@ -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}" |