Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 23:24:33 +0000 (09:24 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 23:24:33 +0000 (09:24 +1000)
commit0579ebd898f4e208ce0bd4c332d71eb878c5059f
treea7fe2afd8a46da238bc86b3f8798b2b324805dd4
parent4ae323abfec7f703120c1c425ea78b367578d2b8
parent94051a438e64eaede021b4e926ef58f793a09a70
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  Re-apply licenseheader text in source files for qt4.8
  Updating file with CRLF line endings for the updated header
  Update licenseheader text in source files for qt4.8
  Updated DEF files for QtGui and QtOpenGl
  Updated DEF files for QtGui and QtOpenGL
src/gui/painting/qdrawhelper_neon.cpp
src/gui/painting/qpaintengine_mac.cpp
tests/auto/qhostinfo/tst_qhostinfo.cpp