Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-05 Thread Edward Welbourne
On 2/4/21 12:20 PM, Volker Hilsheimer wrote: >>> The 6.1 branch’s sha1 is whatever the sha1 in dev was when the >>> branch was created. Things start to diverge from there, but at >>> branching sha1, the new branch’s consistent set is whatever >>> .qtmodules and dependencies.yaml states at that

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-05 Thread Jani Heikkinen
> -Original Message- > From: Development On Behalf Of > Joerg Bornemann > Sent: perjantai 5. helmikuuta 2021 9.57 > To: Volker Hilsheimer > Cc: development@qt-project.org > Subject: Re: [Development] Qt 6.1 Feature Freeze is in effect now > > On 2/4/21 12:20

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-05 Thread Edward Welbourne
> I like the simplicity. No bot fiddling and no "imminent not-yet-created > branch" concept. +1 ___ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-05 Thread Joerg Bornemann
On 2/4/21 12:20 PM, Volker Hilsheimer wrote: The 6.1 branch’s sha1 is whatever the sha1 in dev was when the branch was created. Things start to diverge from there, but at branching sha1, the new branch’s consistent set is whatever .qtmodules and dependencies.yaml states at that time. Does it

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-04 Thread Volker Hilsheimer
> On 3 Feb 2021, at 20:14, Joerg Bornemann wrote: >> But why not get rid of the gap in the first place, ie instead of having a >> gap between >>> - final dependency update sha1s are fixed, full update round started >>> - 6.1 branch is created >> What stops us from simply creating the branch in

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-03 Thread Joerg Bornemann
On 2/3/21 5:36 PM, Volker Hilsheimer wrote: Milk, Joerg. Blame my handwriting! But why not get rid of the gap in the first place, ie instead of having a gap between - final dependency update sha1s are fixed, full update round started - 6.1 branch is created What stops us from simply

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-03 Thread Volker Hilsheimer
> On 3 Feb 2021, at 16:01, Joerg Bornemann wrote: > > On 2/3/21 11:42 AM, Edward Welbourne wrote: > The change in question cannot have the Pick-to: 6.1 footer, because the branch does not exist. How can I avoid to forget cherry-picking that change, once 6.1 is in place? > >>>

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-03 Thread Joerg Bornemann
On 2/3/21 11:42 AM, Edward Welbourne wrote: The change in question cannot have the Pick-to: 6.1 footer, because the branch does not exist. How can I avoid to forget cherry-picking that change, once 6.1 is in place? Yes, that’s a risk with cherry-pick mode. That's the confirmation I was

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-03 Thread Edward Welbourne
On 3 Feb 2021, at 09:31, Joerg Bornemann wrote: >> Let's say I have a change for qtbase's dev branch that is supposed to >> be cherry-picked to 6.1. What happens if this change hits qtbase >> between those two points in time: >> >> - final dependency update sha1s are fixed, full update round

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-03 Thread Volker Hilsheimer
> On 3 Feb 2021, at 09:31, Joerg Bornemann wrote: > > On 2/1/21 1:34 PM, Jani Heikkinen wrote: > >> Qt 6.1 Feature Freeze is in effect now. So please do not add any new >> features, API changes ect in 'dev' anymore until we have done branching from >> 'dev' to '6.1'. We are trying to do

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-03 Thread Joerg Bornemann
On 2/1/21 1:34 PM, Jani Heikkinen wrote: Qt 6.1 Feature Freeze is in effect now. So please do not add any new features, API changes ect in 'dev' anymore until we have done branching from 'dev' to '6.1'. We are trying to do branching from 'dev' to '6.1' as soon as possible but at first we

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-01 Thread Lars Knoll
Ok, as long as they have a low risk of breaking modules depending on qtbase :) Cheers, Lars > On 1 Feb 2021, at 14:27, Giuseppe D'Angelo wrote: > > Il 01/02/21 14:03, Lars Knoll ha scritto: >> Do you have a list of pending features that you think should still go into >> 6.1? > > Just 3-4

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-01 Thread Giuseppe D'Angelo via Development
Il 01/02/21 14:03, Lars Knoll ha scritto: Do you have a list of pending features that you think should still go into 6.1? Just 3-4 patches of mine which have been sitting around approved, but couldn't get merged due to CI trouble last week. Thanks, -- Giuseppe D'Angelo |

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-01 Thread Lars Knoll
Hi Guiseppe, > On 1 Feb 2021, at 13:48, Giuseppe D'Angelo via Development > wrote: > > Il 01/02/21 13:34, Jani Heikkinen ha scritto: >> Qt 6.1 Feature Freeze is in effect now. So please do not add any new >> features, API changes ect in 'dev' anymore until we have done branching from >>

Re: [Development] Qt 6.1 Feature Freeze is in effect now

2021-02-01 Thread Giuseppe D'Angelo via Development
Il 01/02/21 13:34, Jani Heikkinen ha scritto: Qt 6.1 Feature Freeze is in effect now. So please do not add any new features, API changes ect in 'dev' anymore until we have done branching from 'dev' to '6.1'. We are trying to do branching from 'dev' to '6.1' as soon as possible but at first we

[Development] Qt 6.1 Feature Freeze is in effect now

2021-02-01 Thread Jani Heikkinen
Hi all, Qt 6.1 Feature Freeze is in effect now. So please do not add any new features, API changes ect in 'dev' anymore until we have done branching from 'dev' to '6.1'. We are trying to do branching from 'dev' to '6.1' as soon as possible but at first we need to get full dependency update