Merge "No need to fake P->Q upgrade anymore" into qt-dev