Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (485 commits)
  Remove a race condition in SIGCHLD handler.
  Fix warnings about && inside ||
  Update XCreateWindow in qgl_X11egl.cpp
  Allow enum values to be used as signal parameters
  ListModel::clear() should not clear roles
  Lancelot: support for custom keys added to protocol. API cleanup.
  Make sure removed QTextBlock is invalid
  Cocoa: Fixup wrong code in patch baaa5ae
  Designer: Allow promoted QWidget's to be buddies.
  Designer: Specify 'notr' attribute for buttongroup name.
  [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
  HTTP cacheing: do not store the date header with the resource
  Let's not write to the source buffer when blending argb32 on rgb16.
  Add support for -unset <prop> option to qmake.
  make -markuntranslated work without -idbased
  fix conditional on shell type
  Updated QtOpenGL DEF file
  Lancelot: bail out if rendering consistently fails
  Minor optimization to lance/elot
  Make it possible to test the new font hinting in lance[elot]
  ...