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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (132 commits)
  Make QCompleter cope with restricted screen real estate (mobile devices)
  Don't initialize Wintab if QT_NO_TABLETEVENT is defined.
  QDBusXmlGenerator: get the true name from QMetaType for the return type
  Add missing newline to static XML snippet
  Fix compilation in C++0x mode (narrowing of constants)
  My changelog entries for core and network
  Doc: updating html and search feature
  my changelog
  Doc - mention vcsubdirs as a possible value for TEMPLATE
  doc: Second attempt to begin reorganizing the top doc page.
  Fix syntax error in configure script
  fix qmake project file following msvc2010 addition
  remove extraneous return statement
  cosmetics: change enum value
  isOnActiveSpace is available from 10.6.
  QTcpServer: Fix documentation for previous commit
  Keep support for maximum pending connections in derived QTcpServer
  [QNAM FTP] Check for the "ftp" scheme case-insensitively
  Use QUrl::isLocalFile and fix the scheme checking in local URLs.
  Improve QUrl handling of local file paths
  ...

0 files changed, 0 insertions, 0 deletions