Merge "Fix another copy and paste of the copy and paste error." into qt-dev