Hi there, I misunderstood the branch situation for Qt 5.0.2, and I pushed commits to stable which need to be in 5.0.2 (specifically 7661e39c022f76da34fcd5d38ecb93c86e01f1b7 and 7477d50fce9a0008ff4e050285e146ebc0c1e163 which fix a regression introduced in 316d8ececa3314ec16baf46ec4f1c5440cd951ef).
Without those patches the cmake files are unusable, so they need to be in 5.0.2. The easiest way I can see to fix that situation is to fast-forward the release branch to 7661e39c022f76da34fcd5d38ecb93c86e01f1b7. As it is a fast-forward, all commits have already been through CI. The alternative is to cherry-pick the commits into the releasing branch, which will leave us with duplicate commits. As it is easily avoided by fast- forwarding, I'd prefer fast-forwarding. Any reason that can't be done? Thanks, -- Stephen Kelly <[email protected]> | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Releasing mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/releasing
