[oe] [meta-qt5][PATCH v2 01/31] qtbase-native: update sources to 5.6.0

[Andreas Müller]

On Wed, Apr 20, 2016 at 11:24 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> On Tue, Apr 12, 2016 at 12:56:02PM +0200, Andreas Müller wrote:
>> On Tue, Apr 12, 2016 at 12:22 PM, Martin Jansa <martin.jansa at gmail.com> wrote:
>> > On Sun, Apr 10, 2016 at 09:41:00PM +0200, Andreas Müller wrote:
>> >> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
>> >
>> > How did you pick these SRCREVs?
>> If tag for 5.6.0 available: I picked versions tagged.
>> If tag not available I chose revision right before 5.6.1 (as qtqick1)
>> out of 5.6 tree.
>> >
>> > OE @ ~/projects/qt-project/qtbase $ git log --oneline 41706400f605524a5a9953714aa0cfbf811dba7e..d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b
>> > d0cdc7a DirectFB: Fix build in C++98 mode
>> > 3bcc3037 fix non-git non-prefix shadow builds
>> > ae2d11d Add changelog for 5.6.0
>> > 38944d6 Fix syncqt.pl not respecting #pragma qt_no_master_include in files with Windows line endings
>> > 469e293 Fix crash when a standard bus isn't available
>> > bcdcde0 Doc: Simple CSS style: Convert font-sizes from px to pt
>> > 719623a Fix builds without session management.
>> > e7bf0ed Add option to disable "session management by closing windows".
>> >
>> >
>> > It's actually missing some changes which were included in previous SRCREV, I usually use latest in e.g. 5.6 branch
>> > even when it sets the version for next release (e.g. 5.6.1).
>> I was not aware of that. So we'll have to wait for 5.6.1 (whenever it
>> appears) if we want released versions without going backwards.
>>
>> As already noted in V2 description: Version mix 5.6.0/5.6.1 causes
>> cmake trouble and as heavy user of cmake in meta-qt5-extra I would
>> like to avoid...
>
> This revision also has issues building examples, my build failed with:
>
> | /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtbase/5.6.0+gitAUTOINC+d0cdc7ad1e-r0/git/examples/widgets/mainwindows/application/mainwindow.cpp: In constructor 'MainWindow::MainWindow()':
> | /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtbase/5.6.0+gitAUTOINC+d0cdc7ad1e-r0/git/examples/widgets/mainwindows/application/mainwindow.cpp:62:5: error: 'setFallbackSessionManagementEnabled' is not a member of 'QGuiApplication'
> |      QGuiApplication::setFallbackSessionManagementEnabled(false);
> |      ^
> | /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtbase/5.6.0+gitAUTOINC+d0cdc7ad1e-r0/git/examples/widgets/mainwindows/application/mainwindow.cpp:63:20: error: 'commitDataRequest' is not a member of 'QGuiApplication'
> |      connect(qApp, &QGuiApplication::commitDataRequest,
> |                     ^
>
> Which most likely was fixed with:
>> > 719623a Fix builds without session management.
> which is missing in this older SRCREV
>
> To move forward I've squashed your SRCREV changes to single commit and now I'm preparing another
> change which will bump SRCREVs to latest in 5.6 branches. This way people who care more about exact
> 5.6.0 version can use meta-qt5 revision with just your change, other people can follow latest 5.6
> and get also the examples build fixed from upstream.
>
> Regards,
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
I checked:

* Last KDE update in meta-qt5-extra had same trouble (error:
'setFallbackSessionManagementEnabled' is not a member of
'QGuiApplication') and I worked that around. To get rid of these
workarounds, I prepared this series for meta-qt5.
* My builds have packagegroup for session management enabled.
Functions 'setFallbackSessionManagementEnabled' and
'commitDataRequest' are defined in conditional #ifndef
QT_NO_SESSIONMANAGER blocks.

Conclusion: Examples were not properly updated - same issue as I have
at many KDE recipes nobody seems to work/test for Qt without
session-management.

Suggestion:

* Either patch qtbase by adding a patch attached or
* Update to later qt and hope this was fixed upstream - but please
take care that versions of all qt-libs are same (5.6.1??) otherwise
cmake won't find libraries (and I would start crying as heavy cmake
user)

Andreas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-examples-fix-build-for-sessionmanagement-disabled.patch
Type: text/x-patch
Size: 1270 bytes
Desc: not available
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20160420/d9e94074/attachment-0002.bin>