Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 May 2011 22:33:51 +0000 (08:33 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 May 2011 22:33:51 +0000 (08:33 +1000)
commit83a2be48a82394ae692d91587c64f8ccd385350f
tree367d954e74f70acdec4d96253bc5cf72c4eb0c9f
parent9d76dc110124b90bbe362ec8b09db9fc784c0b2d
parent006c8e22075112eff6230d8168d716e44a9e29d5
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.