Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Fix crash and infinite recursion caused by previous commits
  Fix remaining regressions in QWS
  Take Xft.hintstyle by default to match the behavior of GTK+
  Fixed remaining issues in subpixel positioning with FreeType
  Fix QTransform debug output
  qFloor the decoration line width before painting
  Let QTextLine decide its own x position in QPainter
  Avoid repeatedly trying to load unloadable plugins, causing slowness
  Reset GL glyph cache when texture limit is reached
  unlockFace was put in the wrong place in previous patch
  Implement subpixel positioning with FreeType

1 files changed, 1 insertions, 0 deletions

diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp
index 02b0148..0c0c4c8 100644
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -746,6 +746,7 @@ QFontDef qt_FcPatternToQFontDef(FcPattern *pattern, const QFontDef &request)
     QFontDef fontDef;
     fontDef.styleStrategy = request.styleStrategy;
 
+    fontDef.hintingPreference = request.hintingPreference;
     FcChar8 *value = 0;
     if (FcPatternGetString(pattern, FC_FAMILY, 0, &value) == FcResultMatch) {
         fontDef.family = QString::fromUtf8(reinterpret_cast<const char *>(value));