Merge pull request #8411 from Rmys/master

kwin rebuild qpa patch kapatıldı
This commit is contained in:
Rmys
2020-04-12 14:39:51 +03:00
committed by GitHub
3 changed files with 72 additions and 4 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ from pisi.actionsapi import shelltools
def setup():
#shelltools.system("rm -rf po/id")
kde5.configure()
kde5.configure("-DCMAKE_INSTALL_LIBEXECDIR=lib")
def build():
kde5.make()
@@ -0,0 +1,66 @@
From bee3afdd5194e0cf1fb72619b3d130514102e3cf Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Mon, 30 Mar 2020 17:27:11 +0100
Subject: [kcmkwin] Make dialog non blocking
Summary:
It's invoked from QML.
Nested event loops invoked directly from QML is asking for crashes.
BUG: 419118
Test Plan:
Opened KCM
Opened dialog for some settings
Window was still modal as before
Settings were saved
(though they didn't seem to be applied..maybe another bug?)
Reviewers: #kwin, apol
Reviewed By: apol
Subscribers: zzag, kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D28293
---
kcmkwin/common/effectsmodel.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/kcmkwin/common/effectsmodel.cpp b/kcmkwin/common/effectsmodel.cpp
index 47c264f..4927567 100644
--- a/kcmkwin/common/effectsmodel.cpp
+++ b/kcmkwin/common/effectsmodel.cpp
@@ -636,7 +636,7 @@ void EffectsModel::requestConfigure(const QModelIndex &index, QWindow *transient
return;
}
- QPointer<QDialog> dialog = new QDialog();
+ auto dialog = new QDialog();
KCModule *module = index.data(ScriptedRole).toBool()
? findScriptedConfig(index.data(ServiceNameRole).toString(), dialog)
@@ -668,11 +668,13 @@ void EffectsModel::requestConfigure(const QModelIndex &index, QWindow *transient
layout->addWidget(module);
layout->addWidget(buttons);
- if (dialog->exec() == QDialog::Accepted) {
+ connect(dialog, &QDialog::accepted, module, [module]() {
module->save();
- }
+ });
- delete dialog;
+ dialog->setModal(true);
+ dialog->setAttribute(Qt::WA_DeleteOnClose);
+ dialog->show();
}
bool EffectsModel::shouldStore(const EffectData &data) const
--
cgit v1.1
+5 -3
View File
@@ -84,7 +84,7 @@
<Dependency>kirigami-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">disable_qpa.patch</Patch>
<Patch level="1">kdebug-419118.patch</Patch>
</Patches>
</Source>
@@ -141,6 +141,8 @@
<Dependency>libdrm</Dependency>
<Dependency>libinput</Dependency>
<Dependency>ktextwidgets</Dependency>
<Dependency>freetype</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>xcb-util-cursor</Dependency>
</RuntimeDependencies>
<Files>
@@ -216,9 +218,9 @@
<History>
<Update release="38">
<Date>2020-03-29</Date>
<Date>2020-04-12</Date>
<Version>5.18.3</Version>
<Comment>Version bump.</Comment>
<Comment>Version bump qpa patch kapatıldı</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>