(split) manually integrating 282419 and 282414.
(split) manually integrating 282419 and 282414.

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

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