[Development] Qt branches & proposal how to continue with those

[Ville Voutilainen]

On 29 January 2018 at 10:06, Jani Heikkinen <jani.heikkinen at qt.io> wrote:
>> On 29 January 2018 at 08:59, Jani Heikkinen <jani.heikkinen at qt.io> wrote:
>> > - '5.6' will move in 'very strict' mode
>> > - '5.9' will move in 'strict' mode. So no direct submissions anymore,
>> > just cherry picks from stable
>> > - '5.10' will be closed and Qt 5.10.1 will be the final release from
>> > Qt 5.10 series (5.6 and 5.9 are LTS branches so we shouldn't keep Qt
>> > 5.10 active too long)
>> > - '5.11' will be to one and only stable branch
>>
>>
>> The problem here is that there are bugfixes that need to go into 5.9 but cannot
>> go into 5.11, for a variety of reasons. We need to keep 5.9 open for direct
>> submissions.
>
> Hmm, I think putting '5.9' in cherry pick mode with this schedule is agreed way of working, see http://code.qt.io/cgit/meta/quips.git/tree/quip-0005.rst
> And I don't see big issue there; amount of 5.9 specific fixes should be really minimal and if one really needed we can get that in without putting it first in stable: Cherry pick "mode" is more "way of working" & checks are included in sanity bot. And it can be overwritten if really needed.


Yeah, and I was actually thinking more along the lines of boot2qt,
where some things have completely different implementations
between 5.9 and 5.11, and changes just don't merge. So alrighty then,
consider my concern withdrawn.