* [meta-qt5][PATCH v2] qt5: package Qt Quick Designer files separately
@ 2015-09-10 6:57 Samuli Piippo
2015-09-15 20:38 ` Otavio Salvador
0 siblings, 1 reply; 2+ messages in thread
From: Samuli Piippo @ 2015-09-10 6:57 UTC (permalink / raw)
To: openembedded-devel
Some modules (at least Qt Quick Controls and Qt Canvas 3d) have extra
files for Qt Quick Designer integration, which are not needed in the image.
Create new ${PN}-qmldesigner package that includes those files instead of
${PN}-qmlplugins.
Modify qtwebkit recipe so that it removes the conflicting {PN}-examples*
packages, instead of redefining all packages again.
---
recipes-qt/qt5/qt5.inc | 8 +++++++-
recipes-qt/qt5/qtwebkit_git.bb | 4 ++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4c58ad6..17d8fd7 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -45,7 +45,7 @@ INSANE_SKIP_${PN}-examples += "libdir"
INSANE_SKIP_${PN}-examples-dbg += "libdir"
INSANE_SKIP_${PN}-examples-dev += "libdir"
-PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
+PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-dbg = "1"
@@ -58,6 +58,7 @@ RRECOMMENDS_${PN}_class-target = " \
RRECOMMENDS_${PN}-dev = " \
${PN} \
${PN}-mkspecs \
+ ${PN}-qmldesigner \
"
RRECOMMENDS_${PN}-dbg = " \
@@ -85,6 +86,11 @@ FILES_${PN}-plugins-dbg = " \
"
# extra packages
+FILES_${PN}-qmldesigner += " \
+ ${OE_QMAKE_PATH_QML}/*/designer \
+ ${OE_QMAKE_PATH_QML}/*/*/designer \
+"
+
# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
FILES_${PN}-qmlplugins = " \
${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 74f98a7..d80ab7f 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -55,8 +55,8 @@ do_configure_prepend() {
QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
-# remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe
-PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
+# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe
+PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples"
# make sure rb files are used from sysroot, not from host
# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/`
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-qt5][PATCH v2] qt5: package Qt Quick Designer files separately
2015-09-10 6:57 [meta-qt5][PATCH v2] qt5: package Qt Quick Designer files separately Samuli Piippo
@ 2015-09-15 20:38 ` Otavio Salvador
0 siblings, 0 replies; 2+ messages in thread
From: Otavio Salvador @ 2015-09-15 20:38 UTC (permalink / raw)
To: OpenEmbedded Devel List
On Thu, Sep 10, 2015 at 3:57 AM, Samuli Piippo
<samuli.piippo@theqtcompany.com> wrote:
> Some modules (at least Qt Quick Controls and Qt Canvas 3d) have extra
> files for Qt Quick Designer integration, which are not needed in the image.
> Create new ${PN}-qmldesigner package that includes those files instead of
> ${PN}-qmlplugins.
>
> Modify qtwebkit recipe so that it removes the conflicting {PN}-examples*
> packages, instead of redefining all packages again.
Please add Signed-off-by and split this in two commits. Those are
clearly not related.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-15 20:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-10 6:57 [meta-qt5][PATCH v2] qt5: package Qt Quick Designer files separately Samuli Piippo
2015-09-15 20:38 ` Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.