[Development] Grooming the merges?
Mutz, Marc
marc at kdab.com
Wed Jul 17 07:05:09 CEST 2019
Hi,
The qt5.git integration[1] hasn't happened for a month or so (ok two
weeks) and the qtbase 5.13 → dev merge[2] 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[3].
- Fixing the fallout of some QML header shuffling that plagues
qtlocation?
- Fixing the conflicts in the qtbase 5.13 -> dev merge?
Thanks,
Marc
[1] https://codereview.qt-project.org/c/qt/qt5/+/267105
[2] https://codereview.qt-project.org/c/qt/qtbase/+/267814
[3] https://codereview.qt-project.org/c/qt/qtlottie/+/267618
More information about the Development
mailing list