[Development] Final downmerge from dev to '5.11' delayed

[Thiago Macieira]

On Saturday, 3 February 2018 13:00:10 PST Thiago Macieira wrote:
> Ok, since there are still changes unreviewed, despite being up for review
> for over a week and emails posted here, I'll consider non-ready.
> 
> Updating everything to 5.12 and figuring out what are bugfixes that should
> be in 5.11.

Done. The two QJsonValue changes (QUrl and QUuid) are clean and targetted to 
5.11.

The rest of CBOR is now \since 5.12.

Will someone now please review them?

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center