Re: [Development] which branch to use for a fix in 5.9 ?

2018-07-11 Thread Edward Welbourne
Martin Koller (11 July 2018 10:50) wrote (inter alia): > So I assume I should use 5.9 and not 5.9.6, right ? Yes, except that that's an LTS branch, so it only gets cherry-picks back from other branches (unless you have a strong reason otherwise). Which means you actually need to send it to 5.11 (

Re: [Development] which branch to use for a fix in 5.9 ?

2018-07-11 Thread André Hartmann
Hi Martin, The branch 5.9 is in cherry-picking mode, so all fixes need to go to 5.11 currently. If they are considered relevant for 5.9, they can be cherry-picked afterwards. Regards, André Am 11.07.2018 um 10:50 schrieb Martin Koller: Hi, I want to create a patch for the 5.9 version, howe

[Development] which branch to use for a fix in 5.9 ?

2018-07-11 Thread Martin Koller
Hi, I want to create a patch for the 5.9 version, however it's not clear for me which branch to use. This guide http://wiki.qt.io/Branch-Guidelines says: "All bugfixes go into the "most frozen" maintained branch which they are relevant for. " So I assume I should use 5.9 and not 5.9.6, right ?