- update to new qsettings api

Changed files:
    qt4-antialias.patch -> 1.2

diff --git a/qt4-antialias.patch b/qt4-antialias.patch
index 3edb5bc6318baa34d967c9ca16e7a952f2f4b9a6..55968ecbc3e08a9ca46a86e391ec92451867b2a2 100644 (file)
--- a/qt4-antialias.patch
+++ b/qt4-antialias.patch
@@ -1,27 +1,36 @@
---- qt-x11-preview-4.0.0-tp1/src/gui/text/qfontdatabase_x11.cpp.orig   2004-07-08 11:14:44.000000000 +0200
-+++ qt-x11-preview-4.0.0-tp1/src/gui/text/qfontdatabase_x11.cpp        2004-07-14 14:13:10.948503200 +0200
-@@ -20,7 +20,7 @@
+--- qt-copy/src/gui/text/qfontdatabase_x11.cpp.orig    2005-05-13 16:35:52.000000000 +0200
++++ qt-copy/src/gui/text/qfontdatabase_x11.cpp 2005-05-13 18:23:10.861677032 +0200
+@@ -27,7 +27,7 @@
  ****************************************************************************/
  
  #include <qplatformdefs.h>
 -
 +#include <qsettings.h>
  #include <qdatetime.h>
- #include <qpaintdevicemetrics.h>
  #include <qpaintdevice.h>
-@@ -1183,10 +1183,11 @@
-         XftPatternAddMatrix(pattern, XFT_MATRIX, &matrix);
+ 
+@@ -1248,13 +1248,22 @@
+             FcPatternAddMatrix(pattern, FC_MATRIX, &matrix);
+         }
      }
- #  endif // XFT_MATRIX
--
--    if (request.styleStrategy & (QFont::PreferAntialias|QFont::NoAntialias)) {
--        XftPatternAddBool(pattern, XFT_ANTIALIAS,
--                          !(request.styleStrategy & QFont::NoAntialias));
-+    QSettings prefs;
-+    bool qt_use_antialiasing = prefs.readBoolEntry( "/qt/useXft", TRUE );
-+    if ( !qt_use_antialiasing || request.styleStrategy & (QFont::PreferAntialias|QFont::NoAntialias)) {
-+          XftPatternAddBool(pattern, XFT_ANTIALIAS, qt_use_antialiasing &&
-+                          !(request.styleStrategy & QFont::NoAntialias));
++    
++      QSettings prefs;
++      bool qt_use_antialiasing = prefs.value( "/qt/useXft", TRUE ).toBool() ;
++      QFont::StyleStrategy strategy;
++      
++      if (qt_use_antialiasing)
++              strategy=request.styleStrategy;
++      else
++              strategy=QFont::NoAntialias;
+ 
+     if (QX11Info::appDepth(fp->screen) <= 8) {
+         // can't do antialiasing on 8bpp
+         FcPatternAddBool(pattern, FC_ANTIALIAS, false);
+-    } else if (request.styleStrategy & (QFont::PreferAntialias|QFont::NoAntialias)) {
++    } else if (strategy & (QFont::PreferAntialias|QFont::NoAntialias)) {
+         FcPatternAddBool(pattern, FC_ANTIALIAS,
+-                         !(request.styleStrategy & QFont::NoAntialias));
++                         !(strategy & QFont::NoAntialias));
      }
  
-     if (script != QFont::Unicode) {
+     if (script != QUnicodeTables::Common) {