[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    qt-copy/src/kernel
From:       David Faure <faure () kde ! org>
Date:       2003-01-20 12:31:50
[Download RAW message or body]

CVS commit by faure: 

merging problem when applying TT's patch (the one related to QSettings),
I ended up duplicating 10 lines of code.
CCMAIL: Marc Espie <espie@nerim.net>
(thanks for noticing)


  M +0 -14     qapplication_x11.cpp   1.86


--- qt-copy/src/kernel/qapplication_x11.cpp  #1.85:1.86
@@ -1003,18 +1003,4 @@ bool QApplication::x11_apply_settings()
 #endif // QT_NO_XFTFREETYPE
 
-#ifndef QT_NO_XFTFREETYPE
-    // defined in qfont_x11.cpp
-    extern bool qt_has_xft;
-    extern bool qt_use_antialiasing;
-
-    qt_has_xft = FALSE;
-    qt_use_antialiasing = FALSE;
-    if (qt_use_xrender &&
-       XftInit(0) && XftInitFtLibrary()) {
-       qt_has_xft = settings.readBoolEntry( "/qt/enableXft", TRUE );
-       qt_use_antialiasing = settings.readBoolEntry( "/qt/useXft", TRUE );
-    }
-#endif // QT_NO_XFTFREETYPE
-
     QString ximInputStyle =
        settings.readEntry( "/qt/XIMInputStyle",


[prev in list] [next in list] [prev in thread] [next in thread]