How to check what patch version of Qt 5.15 includes a change?

VRonin

Say I have a commit
If I click "included in" I can see in the tags what patch versions of Qt 6 shipped with that change, this is great.
If I go on the cherry-pick for Qt 5.15 and do the same thing, however, I see no tags even though I would have expected this change to be included in 5.15.2 given it was merged a month before release.
What am I missing?

kshegunov

@VRonin said in How to check what patch version of Qt 5.15 includes a change?:

If I go on the cherry-pick for Qt 5.15 and do the same thing, however, I see no tags even though I would have expected this change to be included in 5.15.2 given it was merged a month before release.

Well, according to the cherry-pick list on the right it had been included in some Qt 5.15 release. I don't know if it can be seen from gerrit, but grepping through the the history I have on hand gave me this:

commit dfa856a0e8d848f4a80d28142e3c999a734e11c0
Author: David Faure <david.faure@kdab.com>
Date:   Fri Oct 23 19:07:05 2020 +0200

    QAbstractItemModelTester: don't rely on hasChildren()

So it did went in. Then:

git rev-list -n 1 v5.15.2

replied with: 40143c189b7c1bf3c2058b77d00ea5c4e3be8b28

So, git show ... said:

git show 40143c189b7c1bf3c2058b77d00ea5c4e3be8b28
commit 40143c189b7c1bf3c2058b77d00ea5c4e3be8b28 (tag: v5.15.2, origin/5.15.2)
Author: Antti Kokko <antti.kokko@qt.io>
Date:   Tue Oct 27 10:02:11 2020 +0200

    Add changes file for Qt 5.15.2

This is 4 days after your commit of interest was picked, so it went in 5.15.2.

VRonin

@kshegunov said in How to check what patch version of Qt 5.15 includes a change?:

This is 4 days after your commit of interest was picked, so it went in 5.15.2.

Problem is... it didn't: https://github.com/qt/qtbase/blob/5.15.2/src/testlib/qabstractitemmodeltester.cpp#L441
The line shows the code as it was before the commit
I'm just very confused...

kshegunov

You're right. There's something really fishy.

Here's what I did:

$> cd <path to testlib>
$> git checkout v5.15.2 -- qabstractitemmodeltester.*
$> git blame qabstractitemmodeltester.cpp

Boy, was I in for a surprise. Here's the relevant lines as observed:

b3e4be2d8b9 (Giuseppe D'Angelo 2017-08-24 17:54:04 +0200 435) void QAbstractItemModelTesterPrivate::parent()
b3e4be2d8b9 (Giuseppe D'Angelo 2017-08-24 17:54:04 +0200 436) {
b3e4be2d8b9 (Giuseppe D'Angelo 2017-08-24 17:54:04 +0200 437)     // Make sure the model won't crash and will return an invalid QModelIndex
b3e4be2d8b9 (Giuseppe D'Angelo 2017-08-24 17:54:04 +0200 438)     // when asked for the parent of an invalid index.
b3e4be2d8b9 (Giuseppe D'Angelo 2017-08-24 17:54:04 +0200 439)     MODELTESTER_VERIFY(!model->parent(QModelIndex()).isValid());
b3e4be2d8b9 (Giuseppe D'Angelo 2017-08-24 17:54:04 +0200 440) 
00000000000 (Not Committed Yet 2021-03-31 13:13:46 +0300 441)     if (!model->hasChildren())
b3e4be2d8b9 (Giuseppe D'Angelo 2017-08-24 17:54:04 +0200 442)         return;

This appears as some kind of placeholder for the CI to put the stuff in, or something. I truly don't know and the date is suspect, I've never seen it before. I suggest you ask directly on the mailing list, this is an odd (and probably quite Qt-gerrit-COIN specific) problem, or I'm just asleep and am missing something.

I'm just asleep. I checked out v5.15.2 directly for the module, not only the file. The patch isn't there. Last one that went in is:

commit 47bf767d8da6f1dd13e0fcb3def2abf804d21670
Author: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date:   Fri May 8 13:18:44 2020 +0200

    Close memory leak in QTestLib support for item model testing

This is really confusing though, I'd have expected that it should've been included.

VRonin

@kshegunov said in How to check what patch version of Qt 5.15 includes a change?:

This is really confusing though, I'd have expected that it should've been included.

Agreed. Probably it was just an early patch-freeze

Hampton520

This post is deleted!

Merle652

This post is deleted!