diff options
| author | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-06-21 15:04:43 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-07-02 10:25:31 (GMT) |
| commit | de7a1e3780c145b8721f42bb9477224b5a8ae93f (patch) | |
| tree | 627fcb38c1d867286a3b78a13417163a09f572e4 | |
| parent | 48ecc50d1d5cb698749df97e4ecee0f096904618 (diff) | |
| download | Qt-de7a1e3780c145b8721f42bb9477224b5a8ae93f.zip Qt-de7a1e3780c145b8721f42bb9477224b5a8ae93f.tar.gz Qt-de7a1e3780c145b8721f42bb9477224b5a8ae93f.tar.bz2 | |
Enable glyph uploads from a thread in the X11 font engine.
Note: this doesn't necessarily mean it's thread-safe yet.
| -rw-r--r-- | src/gui/text/qfontengine_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp index b7e4be2..aee21f6 100644 --- a/src/gui/text/qfontengine_x11.cpp +++ b/src/gui/text/qfontengine_x11.cpp @@ -992,7 +992,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int s face_id.filename = file_name; face_id.index = face_index; - canUploadGlyphsToServer = qApp->thread() == QThread::currentThread(); + canUploadGlyphsToServer = QApplication::testAttribute(Qt::AA_X11InitThreads) || (qApp->thread() == QThread::currentThread()); subpixelType = Subpixel_None; if (antialias) { |