diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
| commit | 59068642667b2748b2f24d18c58b1d2fdfed7619 (patch) | |
| tree | deca4d721637676253ed1270f252f8d389286151 /user/calligra/kf5.patch | |
| parent | 4a177049e3d486da3f54d346d63ea80699c08b5b (diff) | |
| parent | 50e523c03bbcb6be1298e3dedb0441b7e47ab2eb (diff) | |
| download | packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.gz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.bz2 packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.xz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.zip | |
Merge branch 'master' into kpartx
Diffstat (limited to 'user/calligra/kf5.patch')
| -rw-r--r-- | user/calligra/kf5.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/user/calligra/kf5.patch b/user/calligra/kf5.patch deleted file mode 100644 index 1a424ef98..000000000 --- a/user/calligra/kf5.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9611a8b3e09f7ae4b53640c11a2196274f39d60f Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 10 Nov 2019 14:28:36 +0100 -Subject: port away from deprecated methods in KWindowSystem >= 5.62 - -(this is in order to make KWindowSystem independent from QtWidgets) ---- - plan/src/workpackage/commandlineparser.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/plan/src/workpackage/commandlineparser.cpp b/plan/src/workpackage/commandlineparser.cpp -index 432f99a..f9be208 100644 ---- a/plan/src/workpackage/commandlineparser.cpp -+++ b/plan/src/workpackage/commandlineparser.cpp -@@ -28,6 +28,7 @@ - #include <KStartupInfo> - #include <KWindowSystem> - #include <KMessageBox> -+#include <kwindowsystem_version.h> - - #include <QApplication> - #include <QDir> -@@ -65,7 +66,12 @@ void CommandLineParser::handleActivateRequest(const QStringList &arguments, cons - handleCommandLine(QDir(workingDirectory)); - - // terminate startup notification and activate the mainwindow -+#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5,62,0) -+ m_mainwindow->setAttribute(Qt::WA_NativeWindow, true); -+ KStartupInfo::setNewStartupId(m_mainwindow->windowHandle(), KStartupInfo::startupId()); -+#else - KStartupInfo::setNewStartupId(m_mainwindow, KStartupInfo::startupId()); -+#endif - KWindowSystem::forceActiveWindow(m_mainwindow->winId()); - - } --- -cgit v1.1 - |