* [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal
@ 2015-02-18 19:26 Alexandre Belloni
2015-02-18 19:26 ` [meta-qt5][dizzy][PATCH 2/2] qtbase: update comments Alexandre Belloni
2015-02-19 11:15 ` [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal Otavio Salvador
0 siblings, 2 replies; 4+ messages in thread
From: Alexandre Belloni @ 2015-02-18 19:26 UTC (permalink / raw
To: openembedded-devel
Add a qmake5_internal class to be used when configuring and compiling qt
itself.
It simply remove the -r parameter from the qmake command line. This is
necessary to avoid those errors when building qtdeclarative or qt3d
without opengl for example:
Project ERROR: Unknown module(s) in QT: quick-private
or
Project ERROR: Unknown module(s) in QT: quick
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
classes/qmake5_internal.bbclass | 41 +++++++++++++++++++++++++++++++++++++++++
recipes-qt/qt5/qt5.inc | 2 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 classes/qmake5_internal.bbclass
diff --git a/classes/qmake5_internal.bbclass b/classes/qmake5_internal.bbclass
new file mode 100644
index 000000000000..8801cb402bdb
--- /dev/null
+++ b/classes/qmake5_internal.bbclass
@@ -0,0 +1,41 @@
+#
+# QMake variables for Qt
+#
+inherit qmake5_base
+
+QT5TOOLSDEPENDS ?= "qtbase-native"
+DEPENDS_prepend = "${QT5TOOLSDEPENDS} "
+
+qmake5_internal_do_configure () {
+ if [ -z "${QMAKE_PROFILES}" ]; then
+ PROFILES="`ls ${S}/*.pro`"
+ else
+ PROFILES="${QMAKE_PROFILES}"
+ bbnote "qmake using profiles: '${QMAKE_PROFILES}'"
+ fi
+
+ if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then
+ AFTER="-after"
+ QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}"
+ bbnote "qmake postvar substitution: '${EXTRA_QMAKEVARS_POST}'"
+ fi
+
+ if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then
+ QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}"
+ bbnote "qmake prevar substitution: '${EXTRA_QMAKEVARS_PRE}'"
+ fi
+
+ # for config.tests to read this
+ export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}"
+
+ CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST"
+ ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD"
+}
+
+do_configure() {
+ qmake5_internal_do_configure
+}
+
+do_install() {
+ qmake5_base_do_install
+}
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index bb0bcdcac0af..f221ed09491e 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -1,7 +1,7 @@
# Copyright (C) 2012, 2014 O.S. Systems Software LTDA.
# Copyright (C) 2013 Martin Jansa <martin.jansa@gmail.com>
-inherit qmake5
+inherit qmake5_internal
PACKAGECONFIG_OPENSSL ?= "openssl"
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-qt5][dizzy][PATCH 2/2] qtbase: update comments
2015-02-18 19:26 [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal Alexandre Belloni
@ 2015-02-18 19:26 ` Alexandre Belloni
2015-02-19 11:15 ` [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal Otavio Salvador
1 sibling, 0 replies; 4+ messages in thread
From: Alexandre Belloni @ 2015-02-18 19:26 UTC (permalink / raw
To: openembedded-devel
Comments regarding the dependencies were outdated, update them.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
recipes-qt/qt5/qtbase.inc | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 1d2efa020b3b..2d2bc07c6148 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -30,8 +30,6 @@ RDEPENDS_${PN}-tools += "perl"
# PACKAGECONFIG is kept rather minimal for people who don't need
# stuff like webkit (and it's easier to add options than remove)
-# gl or gles needs to be enabled in order to build qtdeclarative
-# http://qt.gitorious.org/qt/qtdeclarative/commit/e988998a08b1420ed10bd02d9d4b3b8ed2289df9
PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle xkb', '', d)}"
@@ -77,7 +75,6 @@ PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg"
PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng"
PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib"
PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre"
-# gl or gles2 is needed in order to build qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
PACKAGECONFIG[gl] = "-opengl desktop -no-eglfs,,virtual/libgl"
PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl"
PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib"
@@ -115,7 +112,7 @@ PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl"
-# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
+# needed for qtwebkit
PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal
2015-02-18 19:26 [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal Alexandre Belloni
2015-02-18 19:26 ` [meta-qt5][dizzy][PATCH 2/2] qtbase: update comments Alexandre Belloni
@ 2015-02-19 11:15 ` Otavio Salvador
2015-02-19 11:49 ` Alexandre Belloni
1 sibling, 1 reply; 4+ messages in thread
From: Otavio Salvador @ 2015-02-19 11:15 UTC (permalink / raw
To: OpenEmbedded Devel List
On Wed, Feb 18, 2015 at 5:26 PM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> Add a qmake5_internal class to be used when configuring and compiling qt
> itself.
> It simply remove the -r parameter from the qmake command line. This is
> necessary to avoid those errors when building qtdeclarative or qt3d
> without opengl for example:
> Project ERROR: Unknown module(s) in QT: quick-private
> or
> Project ERROR: Unknown module(s) in QT: quick
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
I use prefer we use a:
USE_RECURSIVE = "0"
Flag or similar to control it and avoid to duplicate the class. Does
it makes sense? Also this patches should target master branch.
--
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] 4+ messages in thread
* Re: [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal
2015-02-19 11:15 ` [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal Otavio Salvador
@ 2015-02-19 11:49 ` Alexandre Belloni
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Belloni @ 2015-02-19 11:49 UTC (permalink / raw
To: openembedded-devel
On 19/02/2015 at 09:15:10 -0200, Otavio Salvador wrote :
> On Wed, Feb 18, 2015 at 5:26 PM, Alexandre Belloni
> <alexandre.belloni@free-electrons.com> wrote:
> > Add a qmake5_internal class to be used when configuring and compiling qt
> > itself.
> > It simply remove the -r parameter from the qmake command line. This is
> > necessary to avoid those errors when building qtdeclarative or qt3d
> > without opengl for example:
> > Project ERROR: Unknown module(s) in QT: quick-private
> > or
> > Project ERROR: Unknown module(s) in QT: quick
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>
> I use prefer we use a:
>
> USE_RECURSIVE = "0"
>
Yeah, see my other patch ;)
> Flag or similar to control it and avoid to duplicate the class. Does
> it makes sense? Also this patches should target master branch.
>
I'm never sure how to tag the branch. I need that patch on both master
and dizzy...
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-19 11:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-18 19:26 [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal Alexandre Belloni
2015-02-18 19:26 ` [meta-qt5][dizzy][PATCH 2/2] qtbase: update comments Alexandre Belloni
2015-02-19 11:15 ` [meta-qt5][dizzy][PATCH 1/2] qmake5: add a qmake5_internal Otavio Salvador
2015-02-19 11:49 ` Alexandre Belloni
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.