diff options
| -rw-r--r-- | recipes-qt/qt6/qt6.inc | 7 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/recipes-qt/qt6/qt6.inc b/recipes-qt/qt6/qt6.inc index 7173fa6..cf51a6b 100644 --- a/recipes-qt/qt6/qt6.inc +++ b/recipes-qt/qt6/qt6.inc @@ -28,7 +28,7 @@ INSANE_SKIP_${PN}-examples += "libdir" SYSROOT_DIRS_append_mingw32 = " ${QT6_INSTALL_BINDIR}" -PACKAGES =. "${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-examples " +PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-examples" ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${PN}-plugins = "1" @@ -98,6 +98,11 @@ FILES_${PN}-staticdev += " \ ${QT6_INSTALL_QMLDIR}/*/*/*/*.prl \ ${QT6_INSTALL_QMLDIR}/*/*/*/*/*.a \ ${QT6_INSTALL_QMLDIR}/*/*/*/*/*.prl \ + ${QT6_INSTALL_LIBDIR}/objects* \ + ${QT6_INSTALL_QMLDIR}/*/objects*/ \ + ${QT6_INSTALL_QMLDIR}/*/*/objects*/ \ + ${QT6_INSTALL_QMLDIR}/*/*/*/objects*/ \ + ${QT6_INSTALL_QMLDIR}/*/*/*/*/objects*/ \ " # Note: INSTALL_EXAMPLESDIR is not used diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index b239436..02309c6 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -50,7 +50,6 @@ PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev gui widgets icu openssl \ jpeg png dbus libinput fontconfig harfbuzz \ ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \ " # Build type: Debug, Release, MinSizeRel, RelWithDebInfo BUILD_TYPE ?= "Release" @@ -61,6 +60,8 @@ OPENSSL_LINKING_MODE ?= "runtime" QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \ bb.utils.contains('PACKAGECONFIG', 'gles2', 'eglfs', 'linuxfb', d), d)}" +PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON" + PACKAGECONFIG[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups" PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus" PACKAGECONFIG[udev] = "-DFEATURE_libudev=ON,-DFEATURE_libudev=OFF,udev" |