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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kfontinst/lib
From:       Laurent Montel <montel () kde ! org>
Date:       2007-12-12 8:31:51
Message-ID: 1197448311.219408.16159.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 747526 by mlaurent:

QT3Support--


 M  +0 -2      CMakeLists.txt  
 M  +2 -2      FcEngine.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/lib/CMakeLists.txt #747525:747526
@@ -1,7 +1,5 @@
 include_directories(${FREETYPE_INCLUDE_DIR})
 
-add_definitions (-DQT3_SUPPORT)
-
 set(kfontinst_LIB_SRCS Misc.cpp DisabledFonts.cpp Fc.cpp)
 set(kfontinstui_LIB_SRCS FcEngine.cpp )
 
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/lib/FcEngine.cpp #747525:747526
@@ -505,7 +505,7 @@
                                             text.length());
                             if(needResize)
                                 pix=pix.scaledToHeight(h);
-                            pix.resize(extents.width+(2*constOffset)<constInitialWidth
+                            pix = QPixmap(extents.width+(2*constOffset)<constInitialWidth
                                            ? extents.width+(2*constOffset)
                                            : constInitialWidth,
                                        h);
@@ -536,7 +536,7 @@
                                 }
                                 if(needResize)
                                     pix=pix.scaledToHeight(h);
-                                pix.resize(x+constOffset<constInitialWidth
+                                pix = QPixmap(x+constOffset<constInitialWidth
                                                ? x+constOffset
                                                : constInitialWidth,
                                            h);
[prev in list] [next in list] [prev in thread] [next in thread]