[Development] Grooming the merges?
Simon.Hausmann at qt.io
Wed Jul 17 08:59:38 CEST 2019
I think the vacation time is slowing things down.
That said, I’ll take care of the remaining declarative changes (thanks Mitch for fixing some!) — those are on my todo.
> On 17. Jul 2019, at 07:07, Mutz, Marc via Development <development at qt-project.org> wrote:
> The qt5.git integration hasn't happened for a month or so (ok two weeks) and the qtbase 5.13 → dev merge is sitting there for three days waiting for someone with merge privs to do conflict resolution. Does anyone feel responsible for
> - qtlottie vs. buildsystem, fixing the no-tests/auto/cmake error we're getting there? The CONFIG change suggested by the error message didn't work out.
> - Fixing the fallout of some QML header shuffling that plagues qtlocation?
> - Fixing the conflicts in the qtbase 5.13 -> dev merge?
>  https://codereview.qt-project.org/c/qt/qt5/+/267105
>  https://codereview.qt-project.org/c/qt/qtbase/+/267814
>  https://codereview.qt-project.org/c/qt/qtlottie/+/267618
> Development mailing list
> Development at qt-project.org
More information about the Development