1 files changed, 35 insertions, 7 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
index 7ae4e19dc3..38b4c873ad 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@@ -67,6 +67,7 @@ QXcbScreen::QXcbScreen(QXcbConnection *connection, xcb_screen_t *scr,
     , m_number(number)
     , m_refreshRate(60)
     , m_forcedDpi(-1)
+    , m_hintStyle(QFontEngine::HintStyle(-1))
 {
     if (connection->hasXRandr())
         xcb_randr_select_input(xcb_connection(), screen()->root, true);
@@ -481,6 +482,35 @@ QPixmap QXcbScreen::grabWindow(WId window, int x, int y, int width, int height)
     return result;
 }
 
+bool QXcbScreen::xResource(const QByteArray &identifier,
+                           const QByteArray &expectedIdentifier,
+                           int *value)
+{
+    Q_ASSERT(value != 0);
+    if (identifier.startsWith(expectedIdentifier)) {
+        QByteArray stringValue = identifier.mid(expectedIdentifier.size());
+
+        bool ok;
+        *value = stringValue.toInt(&ok);
+        if (!ok) {
+            if (stringValue == "hintfull")
+                *value = QFontEngine::HintFull;
+            else if (stringValue == "hintnone")
+                *value = QFontEngine::HintNone;
+            else if (stringValue == "hintmedium")
+                *value = QFontEngine::HintMedium;
+            else if (stringValue == "hintslight")
+                *value = QFontEngine::HintLight;
+
+            return *value != 0;
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
 void QXcbScreen::readXResources()
 {
     int offset = 0;
@@ -508,13 +538,11 @@ void QXcbScreen::readXResources()
     QList<QByteArray> split = resources.split('\n');
     for (int i = 0; i < split.size(); ++i) {
         const QByteArray &r = split.at(i);
-        if (r.startsWith("Xft.dpi:\t")) {
-            bool ok;
-            int dpi = r.mid(sizeof("Xft.dpi:")).toInt(&ok);
-            if (ok)
-                m_forcedDpi = dpi;
-            break;
-        }
+        int value;
+        if (xResource(r, "Xft.dpi:\t", &value))
+            m_forcedDpi = value;
+        else if (xResource(r, "Xft.hintstyle:\t", &value))
+            m_hintStyle = QFontEngine::HintStyle(value);
     }
 }