[automerger skipped] Merge "API: Explicitly track incompatibilities with...

[automerger skipped] Merge "API: Explicitly track incompatibilities with previous API versions" into qt-dev
am: d3b53e08 -s ours
am skip reason: change_id I1f17b57705e2f7350b55ab278e06fc4e988771ff with SHA1 369246b4 is in history

Change-Id: Icac6f223315835821685d2e1f16f7a8aa35c465b