fix symbols fonts on X11

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13378 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/ChangeLog b/src/frontends/qt4/ChangeLog
index 229cac6d607d2d96ecee531ba94eac778d309004..a612cc80ae62ce03f54d72fef2e3dcd0a448ceb2 100644 (file)
--- a/src/frontends/qt4/ChangeLog
+++ b/src/frontends/qt4/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-15  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * qfont_loader.C (isChosenFont): Xft-enabled Qt 4.1 seems to call
+       all fonts "Multi". Therefore test for this case.
+
 2006-03-15  Abdelrazak Younes  <younes.a@free.fr>\r
 \r
        * QLPopupMenu.[Ch]: renamed topLevelMenu to topLevelMenu_\r

diff --git a/src/frontends/qt4/qfont_loader.C b/src/frontends/qt4/qfont_loader.C
index 8a3ce1cf95e26ab5c3069ca954f6b6778e3d8358..50a600116a0624ffcea25354e7668b999531147c 100644 (file)
--- a/src/frontends/qt4/qfont_loader.C
+++ b/src/frontends/qt4/qfont_loader.C
@@ -177,7 +177,8 @@ bool isChosenFont(QFont & font, string const & family)
        }
 
        // Qt 3.2 beta1 returns "xft" for all xft fonts
-       if (font.rawName() == "xft") {
+       // Qt 4.1 returns "Multi" for all ? xft fonts
+       if (font.rawName() == "xft" || font.rawName() == "Multi") {
                if (contains(fromqstr(fi.family()), family)) {
                        lyxerr[Debug::FONT] << " got it (Xft) ";
                        return true;