- Updated for 4.1.0

Changed files:
    qt4-antialias.patch -> 1.4
    qt4-tools.patch -> 1.5

diff --git a/qt4-antialias.patch b/qt4-antialias.patch
index 9a06d34acbb3068e980700230d990b4f308441fa..ba57fa8f18ff33ff91862ee37fe1634883e0bebb 100644 (file)
--- a/qt4-antialias.patch
+++ b/qt4-antialias.patch
@@ -9,10 +9,10 @@
  #include <qdatetime.h>
  #include <qpaintdevice.h>
  
-@@ -1248,13 +1248,16 @@
-             FcPatternAddMatrix(pattern, FC_MATRIX, &matrix);
-         }
-     }
+@@ -1248,8 +1248,11 @@
+     if (!stretch)
+         stretch = 100;
+     FcPatternAddInteger(pattern, FC_WIDTH, stretch);
 +    
 +      QSettings prefs;
 +      bool qt_use_antialiasing = prefs.value( "/qt/useXft", TRUE ).toBool() ;
@@ -22,10 +22,3 @@
          // can't do antialiasing on 8bpp
          FcPatternAddBool(pattern, FC_ANTIALIAS, false);
      } else if (request.styleStrategy & (QFont::PreferAntialias|QFont::NoAntialias)) {
--        FcPatternAddBool(pattern, FC_ANTIALIAS,
--                         !(request.styleStrategy & QFont::NoAntialias));
-+          FcPatternAddBool(pattern, FC_ANTIALIAS,
-+            !(request.styleStrategy & QFont::NoAntialias));
-     }
- 
-     if (script != QUnicodeTables::Common) {

diff --git a/qt4-tools.patch b/qt4-tools.patch
index 61919acbeb64f5a99385797f4031f5775b5adb4a..052442b9263b3ff8277703df4e21851b0a0f3b6e 100644 (file)
--- a/qt4-tools.patch
+++ b/qt4-tools.patch
@@ -1,12 +1,11 @@
 --- qt-copy/tools/tools.pro.orig       2005-05-13 16:39:18.000000000 +0200
 +++ qt-copy/tools/tools.pro    2005-05-13 20:02:31.761482520 +0200
-@@ -5,7 +5,8 @@
-     SUBDIRS           = assistant/lib \
+@@ -7,7 +7,7 @@
                        assistant \
                        linguist \
--                      porting
-+                      porting \
-+                      qvfb
+                       porting \
+-                        qtestlib
++                        qtestlib qvfb
      !contains(QT_EDITION, Console):SUBDIRS += designer
-     unix:SUBDIRS        += qtconfig
- }
+     unix:!embedded:SUBDIRS        += qtconfig
+     win32:!contains(QT_EDITION, OpenSource|Console):SUBDIRS       += activeqt