Merge branch 'Plasma/5.4'

2015-10-20 07:35:01 +02:00 · 2015-10-20 07:35:01 +02:00 · a730b5d2f6
parent 5f8e8985df 10ad9262a1
commit a730b5d2f6
1 changed files with 5 additions and 1 deletions
--- a/decorations/decoratedclient.cpp
+++ b/decorations/decoratedclient.cpp
@ -163,10 +163,14 @@ DELEGATE(requestToggleKeepBelow, KeepBelowOp)

 DELEGATE(requestContextHelp, showContextHelp)
 DELEGATE(requestMinimize, minimize)
-DELEGATE(requestClose, closeWindow)

 #undef DELEGATE

+void DecoratedClientImpl::requestClose()
+{
+    QMetaObject::invokeMethod(m_client, "closeWindow", Qt::QueuedConnection);
+}
+
 QColor DecoratedClientImpl::color(KDecoration2::ColorGroup group, KDecoration2::ColorRole role) const
 {
    auto dp = m_client->decorationPalette();