Merge "ktlint fixes" into qt-qpr1-dev