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

Change-Id: Ief55922ccfb519eaac1be1ffbe74959a03eb9375