remove "header" and assignmets which are defaults or bogus, reorder some assignments. Change-Id: I67403872168c890ca3b696753ceb01c605d19be7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Task-number: QTBUG-21260 Change-Id: I7bc30227d4e71e8783f274dbfa758399dca546d4 Reviewed-on: http://codereview.qt.nokia.com/4146 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>