Merge "Leverage the code from qt-qpr1-dev to master"