(split) p4i integration Integrate 303628 from 4.4 to main: Make sure the attributes of <value-type> <object-type> etc. are also merged when you merge the two type systems. (e.g. <value-type name="QFooBar" foo="bar" /> and              <value-type name="QFooBar" bar="foo" /> becomes              <value-type name="QFooBar" foo="bar" bar="foo" />
(split) p4i integration Integrate 303628 from 4.4 to main: Make sure the attributes of <value-type> <object-type> etc. are also merged when you merge the two type systems. (e.g. <value-type name="QFooBar" foo="bar" /> and              <value-type name="QFooBar" bar="foo" /> becomes              <value-type name="QFooBar" foo="bar" bar="foo" />

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

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