Merge branch 'Plasma/5.0'

Conflicts:
	kcmkwin/kwindesktop/desktop.desktop
This commit is contained in:
Martin Gräßlin 2014-09-08 10:07:57 +02:00
commit d96af81f5e

View file

@ -104,7 +104,7 @@ void ThemeConfig::load(const KConfig &conf)
m_alignment = Qt::AlignLeft;
}
else if (alignment == QStringLiteral("center")) {
m_alignment = Qt::AlignCenter;
m_alignment = Qt::AlignHCenter;
}
else {
m_alignment = Qt::AlignRight;