Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (67 commits)
  Skip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does not passes
  QScript: more missing APIShim
  Fix compilation warnings
  QScript: fix compilation warning
  QScript:  fix APIShim usage.
  QtScript:  remove duplicated APIshim in QScriptValueIterator
  Attempt to fix the test.
  Total makeover of SVG image reader
  Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.
  Micro optimization after feedback from Jan-Arve.
  Show only one dialog when using QFileDialog on Mac.
  Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7
  Fix bad merge from 4.6.
  Doc: Updated the qdoc manual with i18n info. Fixed a code example.
  Fix QStaticText test on Mac
  Support the pen set on the painter in QStaticText when using rich text
  Fix setting font for QStaticText on Linux and Mac
  Hack .pro files on windows to define QT_NO_EGL
  Fix QDate::isLeapYear() for years < 1
  One more test for chinese codecs
  ...