From fc6ea0e1d90ddba7df97f7b38f000ea795eadbef Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 10 Nov 2019 11:46:00 +0100 Subject: [PATCH 1/2] GIT_SILENT Upgrade KDE Applications version to 19.11.80. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88ccca2561..47fe3dc474 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "11") -set (KDE_APPLICATIONS_VERSION_MICRO "70") +set (KDE_APPLICATIONS_VERSION_MICRO "80") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) From d8f9ca49d333540796713a8842a1bea7622d0444 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 10 Nov 2019 14:19:17 +0100 Subject: [PATCH 2/2] Port away from deprecated API in KWindowSystem >= 5.62 --- src/dolphinmainwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 17d9901f9b..e28b18cd3d 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -235,7 +235,8 @@ void DolphinMainWindow::openFiles(const QStringList& files, bool splitView) void DolphinMainWindow::activateWindow() { - KStartupInfo::setNewStartupId(window(), KStartupInfo::startupId()); + window()->setAttribute(Qt::WA_NativeWindow, true); + KStartupInfo::setNewStartupId(window()->windowHandle(), KStartupInfo::startupId()); KWindowSystem::activateWindow(window()->effectiveWinId()); }