[Releasing] Some CMake patches for 5.0.2
stephen.kelly at kdab.com
Fri Feb 22 15:11:14 CET 2013
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
7477d50fce9a0008ff4e050285e146ebc0c1e163 which fix a regression introduced in
Without those patches the cmake files are unusable, so they need to be in
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?
Stephen Kelly <stephen.kelly at kdab.com> | 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
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 3636 bytes
Desc: not available
More information about the Releasing