Merge "Require a more specific intent" into qt-dev