Merge remote-tracking branch 'origin/Plasma/5.9'

This commit is contained in:
Albert Astals Cid 2017-01-21 00:17:50 +01:00
commit 060fadee09

View file

@ -82,6 +82,7 @@ CubeEffectConfig::CubeEffectConfig(QWidget* parent, const QVariantList& args) :
m_ui->editor->addCollection(m_actionCollection); m_ui->editor->addCollection(m_actionCollection);
capsSelectionChanged();
connect(m_ui->kcfg_Caps, SIGNAL(stateChanged(int)), this, SLOT(capsSelectionChanged())); connect(m_ui->kcfg_Caps, SIGNAL(stateChanged(int)), this, SLOT(capsSelectionChanged()));
m_ui->kcfg_Wallpaper->setFilter(QStringLiteral("*.png *.jpeg *.jpg ")); m_ui->kcfg_Wallpaper->setFilter(QStringLiteral("*.png *.jpeg *.jpg "));
addConfig(CubeConfig::self(), m_ui); addConfig(CubeConfig::self(), m_ui);