> -----Original Message----- > From: Development <development-bounces+jani.heikkinen=qt.io@qt- > project.org> On Behalf Of Liang Qi > Sent: maanantai 13. elokuuta 2018 12.30 > To: development@qt-project.org > Subject: [Development] Merge and Integration status report - 2018.08.13 > > Integrations > > * qt5 5.11 integration is healthy, last one is yesterday, August 12 > > * qt5 dev, last one is August 11, excluding qtbase since August 8 > * * http://bugreports.qt.io/browse/QTBUG-69891 > tests/auto/quick/drawingmodes hanging > Tor Arne is working on that. But if can't get fix soon, suggest to revert > https://codereview.qt-project.org/#/c/235685/ for now, because there are > about 20-30 > changes including a 5.11->dev merge in qtbase which are not integrated in > qt5 dev yet.
As discussed earlier we should do reverts much easier to avoid blocking of other's work. We will start branching from 'dev' -> '5.12' today and we should get latest changes in qtbase as soon as possible as well. So in my opinion we should just do the revert & bring the change back when fix is available. br, Jani > > Merges - healthy! > > Thanks Simon and Edward for their work during July! > > -- Liang > _______________________________________________ > Development mailing list > Development@qt-project.org > http://lists.qt-project.org/mailman/listinfo/development _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development