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

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

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (46 commits)
  Add Q_UNIMPLEMENTED() macro
  Fix build error on Mac
  Build fix
  BC cleanup in uitools.
  Fix framework absolute path issue
  Remove QFontEngineFT::loadGlyphMetrics
  Add required font metrics functions to QRawFont
  Include pixel size of font in exported HTML from QTextDocument
  Make it possible for animation driver to specify the advance time delta
  Compile on Windows
  Remove warnings
  Fix Wayland plugin so it works with the wayland bind api
  wayland: Track wayland changes
  Support GL ES 2 with uikit.
  Lighthouse: Fix virtual desktopwidget
  Support gamma correction of text on GL
  Added .tag file with Git revision.
  new configure.exe binary
  qmake nmake generator: pass MAKEFLAGS to sub-make calls
  Move private headers into versioned subdirectory
  ...