Uploaded image for project: 'Qt'
  1. Qt
  2. QTBUG-78019

Final downmerges from dev to 5.14 were not executed correctly

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed
    • Priority: P0: Blocker
    • Resolution: Done
    • Affects Version/s: 5.14.0
    • Fix Version/s: 5.14.0 Alpha
    • Component/s: Packaging & Installer
    • Labels:
      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

        No reviews matched the request. Check your Options in the drop-down menu of this sections header.

          Activity

            People

            Assignee:
            kari.oikarinen Kari Oikarinen
            Reporter:
            kari.oikarinen Kari Oikarinen
            Votes:
            0 Vote for this issue
            Watchers:
            6 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved: