diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-04 10:20:19 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-22 16:52:08 +0000 |
commit | f1a5e8aa9e3cc6de854cbfb65052e9ac5990e691 (patch) | |
tree | 0980c4e05f7b6954ed0393a8ad033d1cd69865dc | |
parent | 2be27319a1bc78a4507a6a466f70bc34b1d1f8d2 (diff) | |
download | meta-qt5-f1a5e8aa9e3cc6de854cbfb65052e9ac5990e691.tar.gz |
qtwebengine: include sources in the debug package, add x11 PACKAGECONFIG
* Remove override for PACKAGE_DEBUG_SPLIT_STYLE so that source code
for QtWebEngine is included in the debug package.
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 63c281a6..71b9ecba 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -25,6 +25,7 @@ DEPENDS += " \ | |||
25 | libcap \ | 25 | libcap \ |
26 | gperf-native \ | 26 | gperf-native \ |
27 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ | 27 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ |
28 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | DEPENDS_append_libc-musl = " libexecinfo" | 31 | DEPENDS_append_libc-musl = " libexecinfo" |
@@ -119,7 +120,6 @@ do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" | |||
119 | do_install_append() { | 120 | do_install_append() { |
120 | sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc | 121 | sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc |
121 | } | 122 | } |
122 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" | ||
123 | 123 | ||
124 | # for /usr/share/qt5/qtwebengine_resources.pak | 124 | # for /usr/share/qt5/qtwebengine_resources.pak |
125 | FILES_${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}" | 125 | FILES_${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}" |