Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
Updating file with CRLF line endings for the updated header
Update licenseheader text in source files for qt4.8
X11: Keep the menubar inside the widgetbox window in toplevel mode
Retain ABI and API compatibility when Qt is built with EGL.
Allow 'typeinfo <file>' lines in qmldir.
qmlplugindump: Use command line options with a single dash.
qmlplugindump: Allow dumping by path without URI.
Move qmldump from Qt Creator to Qt.