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

Merge branch 'Plasma/5.2'

Browse source 
Conflicts:
	CMakeLists.txt
This commit is contained in:
Martin Gräßlin 2015-01-26 11:09:07 +01:00
commit 82938dd96b
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwindecoration/kcm.cpp
View file

@ -396,7 +396,9 @@ bool ConfigurationModule::eventFilter(QObject *watched, QEvent *e)
void ConfigurationModule::updateColors()
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
m_ui->view->setClearColor(m_ui->view->palette().color(QPalette::Window));
#endif
m_ui->view->rootContext()->setContextProperty("highlightColor", QPalette().color(QPalette::Highlight));
}