[automerger skipped] Merge "Explicitly track incompatibilities with previous API versions" into qt-dev am: 8a7db027c1 am: 7feb4a1b29 -s ours
am: 7eedf701fb -s ours
am skip reason: change_id I3d9e78357f4d91b702d321eb1ce1e71bb90e478b with SHA1 2ffa847904 is in history

Change-Id: I385adf832ba0a1a254b05889355284024c138047