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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (36 commits)
  Disable autotest broken by the change to QCache in 7ab0bed
  find qt.conf more reliably
  Generate glyphs in un-transformed coordinate system.
  Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
  Reset trailingSpaces in relayout
  Prevent QPixmapCache potentially growing indefinitely.
  Allocate 16-byte aligned memory independent of platform for raster pool.
  qmake vcxproj generator: fix XML conversion for build events
  Fix trailing spaces problem by not adding it to QScriptLine.length
  Fix RTL layout for fonts when non-printable character has an advance
  Fix regression in tst_qrawfont
  Fix double click and drag not extending word selection.
  Split CFLAGS from pkg-config properly
  Ensure that the proxystyle is used over the style's own functions
  runonphone: Add a missing space between a message and the file name
  Perl check for windows configure.
  QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
  QSettings: use the common appdata dir when bootstrapping qmake on win
  Merge fixes for QDir::operator==
  Replace explicit surrogate handlers by inline methods of QChar class
  ...

0 files changed, 0 insertions, 0 deletions