Merge "Ui should be UI in the javadoc" into qt-dev