Details
-
Bug
-
Resolution: Done
-
P0: Blocker
-
5.14.0
-
None
Description
Due to a malfunctioning script, all the fast-forward merges were not actually pushed. This means that following modules don't contain all the changes they should in 5.14 branch, if there was any in the dev branch at the time the merges were supposed to be done:
- qt3d
- qtactiveqt
- qtandroidextras
- qtcharts
- qtcoap
- qtconnectivity
- qtdatavis3d
- qtdoc
- qtgamepad
- qtgraphicaleffects
- qtimageformats
- qtlocation
- qtlottie
- qtmacextras
- qtmqtt
- qtmultimedia
- qtnetworkauth
- qtpurchasing
- qtquick3d
- qtquickcontrols
- qtquickcontrols2
- qtquicktimeline
- qtremoteobjects
- qtscript
- qtscxml
- qtsensors
- qtserialbus
- qtserialport
- qtspeech
- qtsvg
- qttranslations
- qtvirtualkeyboard
- qtwebchannel
- qtwebengine
- qtwebglplugin
- qtwebview
- qtwinextras
- qtx11extras
- qtxmlpatterns
Since dev has since moved on, the situation can't be fixed by fixing the script and re-running it. Instead in each of these modules we need to merge the changes that should have merged into 5.14. The version bumps to 5.15 were done in dev very shortly after the attempted downmerges (and dev was locked for staging even slightly before that), so the commit preceding the version bump should be the right one.
Attachments
For Gerrit Dashboard: QTBUG-78019 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
272641,2 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qt3d | Status: MERGED | +2 | 0 |
272648,2 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qtandroidextras | Status: MERGED | +2 | 0 |
272652,2 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qtdatavis3d | Status: MERGED | +2 | 0 |
272669,1 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qtdoc | Status: MERGED | +2 | 0 |
272670,1 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qtimageformats | Status: MERGED | +2 | 0 |
272671,1 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qtlocation | Status: MERGED | +2 | 0 |
272675,1 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qtmultimedia | Status: MERGED | +2 | 0 |
272678,1 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qtremoteobjects | Status: MERGED | +2 | 0 |
272680,1 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qtscxml | Status: MERGED | +2 | 0 |
272685,1 | Merge dev into 5.14 (delayed final downmerge) | 5.14 | qt/qtwebengine | Status: MERGED | +2 | 0 |