Re: [Development] Qt 3D 5.7 -> 5.7.1 missing merge

2016-10-07 Thread Kevin Ottens
Hello, On Friday, 7 October 2016 10:30:20 CEST Oswald Buddenhagen wrote: > On Fri, Oct 07, 2016 at 10:10:39AM +0200, Kevin Ottens wrote: > > I found out yesterday that some patches of the 5.7 branch are not in > > 5.7.1. > > i see no evidence of this being true at this time. Ah, I see, it happen

Re: [Development] Qt 3D 5.7 -> 5.7.1 missing merge

2016-10-07 Thread Oswald Buddenhagen
On Fri, Oct 07, 2016 at 10:10:39AM +0200, Kevin Ottens wrote: > I found out yesterday that some patches of the 5.7 branch are not in 5.7.1. > i see no evidence of this being true at this time. > Those patches were produced in 5.7 because we were expecting a final > 5.7 -> 5.7.1 merge. > given th

[Development] Qt 3D 5.7 -> 5.7.1 missing merge

2016-10-07 Thread Kevin Ottens
Hello, I found out yesterday that some patches of the 5.7 branch are not in 5.7.1. Those patches were produced in 5.7 because we were expecting a final 5.7 -> 5.7.1 merge. Those patches are necessary for some examples to work properly, that's why we would need them in 5.7.1 as well. What woul