yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port away from KGlobalSettings::windowTitleFont in libkdecorations

Browse source 
And with that it's no longer linking kde4support.
This commit is contained in:
Martin Gräßlin 2013-09-02 11:22:59 +02:00
parent bd2c80428c
commit 48e8121ab9
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libkdecorations/CMakeLists.txt
View file

@ -12,7 +12,6 @@ kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS})
target_link_libraries(kdecorations
Qt5::Widgets
Qt5::X11Extras
${KDE4Support_LIBRARIES} # kdebug
KF5::KConfigCore
KF5::KI18n
KF5::KService # KLibrary

4
libkdecorations/kdecoration_p.cpp
View file

@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kglobalsettings.h>
#include <QFontDatabase>
#include <QPalette>
#include <QApplication>
#include <assert.h>
@ -138,7 +138,7 @@ unsigned long KDecorationOptionsPrivate::updateSettings(KConfig* config)
QFont old_activeFontSmall = activeFontSmall;
QFont old_inactiveFontSmall = inactiveFontSmall;
QFont activeFontGuess = KGlobalSettings::windowTitleFont();
QFont activeFontGuess = QFontDatabase::systemFont(QFontDatabase::TitleFont);
activeFont = wmConfig.readEntry("activeFont", activeFontGuess);
inactiveFont = wmConfig.readEntry("inactiveFont", activeFont);