[neon/kde/knewstuff/Neon/unstable] debian/patches: Revert "patch recommended by dev"

Jonathan Esk-Riddell null at kde.org
Fri May 27 18:57:10 BST 2022


Git commit d085b092b5ea9d782527c49f0f8eb9b90bd4ba87 by Jonathan Esk-Riddell.
Committed on 27/05/2022 at 17:57.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "patch recommended by dev"

This reverts commit 314885df37f8368c346ccfd63227746194b2c234.

D  +0    -29   debian/patches/b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/knewstuff/commit/d085b092b5ea9d782527c49f0f8eb9b90bd4ba87

diff --git a/debian/patches/b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb.diff b/debian/patches/b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb.diff
deleted file mode 100644
index fcf2a31..0000000
--- a/debian/patches/b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/qtquickdialogwrapper.cpp b/src/qtquickdialogwrapper.cpp
-index 4f22b650607d988b42cc5454e6430b9be1561960..e31e8d805f17d3f5481179938a2aea0ab065803f 100644
---- a/src/qtquickdialogwrapper.cpp
-+++ b/src/qtquickdialogwrapper.cpp
-@@ -7,10 +7,12 @@
- #include "qtquickdialogwrapper.h"
- 
- #include <QEventLoop>
-+#include <QGuiApplication>
- #include <QQmlComponent>
- #include <QQmlContext>
- #include <QQmlEngine>
- #include <QTimer>
-+#include <QWindow>
- 
- #include <KLocalizedContext>
- 
-@@ -70,6 +72,11 @@ QtQuickDialogWrapper::QtQuickDialogWrapper(const QString &configFile, QObject *p
- 
-         // Forward relevant signals
-         connect(d->item, SIGNAL(closed()), this, SIGNAL(closed()));
-+
-+        // Otherwise, the dialog is not in front of other popups, BUG: 452593
-+        auto window = qobject_cast<QWindow *>(d->item);
-+        Q_ASSERT(window);
-+        window->setTransientParent(QGuiApplication::focusWindow());
-     }
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2fad84f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb.diff


More information about the Neon-commits mailing list