(split) Manually port 276518 to qtjambi/main (can't be integrated since we've split the files)
(split) Manually port 276518 to qtjambi/main (can't be integrated since we've split the files)

[git-p4: depot-paths = "//depot/qtjambi/main/": change = 276525]

qt-generator/qt-generator,qt-generator/qt-generator,qt-generator/qt-generator