Merge "Revert "Depecrate flags, and try to match them to actions"" into qt-dev