[oe] [meta-qt5][PATCHv2] Upgrade to Qt 5.8

Martin Jansa martin.jansa at gmail.com
Wed Nov 23 15:43:46 UTC 2016


On Wed, Nov 23, 2016 at 04:29:41PM +0100, Martin Jansa wrote:
> On Fri, Nov 18, 2016 at 09:48:54AM +0200, Samuli Piippo wrote:
> > The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain
> > the contents of an environment value when qmake is run instead of when
> > Makefile is processed. All OE_QMAKE_xxx variables need to be exported
> > for qmake to find them. configure's setBootstrapVariable function needs
> > to change $$(..) to normal $(...) operator to work with qmake's Makefile.
> > 
> > qt.conf generation for qtbase recipes is not needed, as configure will
> > generate its own version based on configure arguments. Skip running
> > qmake, since configure is now automatically invoked when it's run in
> > qtbase's root folder.
> > 
> > Update PACKAGECONFIGs for qtbase to match current configure options.
> > 
> > Merge the two qtwayland recipes to one that supports all three targets
> > (target, native, nativesdk) without need for additional patch.
> > 
> > Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213
> > Signed-off-by: Samuli Piippo <samuli.piippo at qt.io>
> > ---
...
> > diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
> > index e1e25ba..a1dd16a 100644
> > --- a/recipes-qt/qt5/qt5-git.inc
> > +++ b/recipes-qt/qt5/qt5-git.inc
> > @@ -2,7 +2,7 @@
> >  # Copyright (C) 2013-2016 Martin Jansa <martin.jansa at gmail.com>
> >  
> >  QT_MODULE ?= "${BPN}"
> > -QT_MODULE_BRANCH ?= "5.7"
> > +QT_MODULE_BRANCH ?= "5.8"
> >  QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
> >  
> >  # each module needs to define valid SRCREV
> > @@ -12,4 +12,4 @@ SRC_URI = " \
> >  
> >  S = "${WORKDIR}/git"
> >  
> > -PV = "5.7.0+git${SRCPV}"
> > +PV = "5.8.0+git${SRCPV}"
> 
> This version is wrong as 5.8.0 wasn't released yet (was it?), so this PV
> shouldn't sort higher then 5.8.0 release.
> 
> I'll change it to:
> 5.7.99+5.8.0-beta+git${SRCPV}
> like I did in previous releases.
> 
> Regards,
...

There is also some issue with qtwayland and qtenginio reported in:
http://lists.openembedded.org/pipermail/openembedded-devel/2016-November/110021.html

I'm trying to reproduce it with only oe-core+meta-qt5, because the qtwayland
one might be caused by bbappend in meta-luneui, but qtenginio might be
easier to reproduce.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20161123/01a7d569/attachment-0002.sig>


More information about the Openembedded-devel mailing list