From 333e8ddef13ce9a2694f4de3c4d54c9d4c858e1f Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Feb 17 2020 12:24:49 +0000 Subject: Do not crash when showing tooltip --- diff --git a/kdevelop-do-not-crash-when-showing-tooltip.patch b/kdevelop-do-not-crash-when-showing-tooltip.patch new file mode 100644 index 0000000..2f79d34 --- /dev/null +++ b/kdevelop-do-not-crash-when-showing-tooltip.patch @@ -0,0 +1,18 @@ +diff --git a/kdevplatform/util/activetooltip.cpp b/kdevplatform/util/activetooltip.cpp +index 7ac9894..93e67c4 100644 +--- a/kdevplatform/util/activetooltip.cpp ++++ b/kdevplatform/util/activetooltip.cpp +@@ -106,7 +106,12 @@ void ActiveToolTipManager::doVisibility() + if (!fullGeometry.isEmpty()) { + QRect oldFullGeometry = fullGeometry; + #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +- QRect screenGeometry = QGuiApplication::screenAt(fullGeometry.topLeft())->geometry(); ++ const auto *screen = QGuiApplication::screenAt(fullGeometry.topLeft()); ++ if (!screen) { ++ screen = qApp->primaryScreen(); ++ qWarning() << "failed to find screen:" << fullGeometry << "fallback primary geometry:" << screen->geometry(); ++ } ++ QRect screenGeometry = screen->geometry(); + #else + QRect screenGeometry = QApplication::desktop()->screenGeometry(fullGeometry.topLeft()); + #endif diff --git a/kdevelop.spec b/kdevelop.spec index 8813967..2f791bb 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -3,7 +3,7 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 5.5.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ Source0: http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{version}.tar.xz @@ -18,6 +18,7 @@ Patch0: kdevelop-5.2.3-qmake.patch # upstreamable patches # upstream patches +Patch10: kdevelop-do-not-crash-when-showing-tooltip.patch BuildRequires: gcc-c++ gcc BuildRequires: boost-devel @@ -143,6 +144,8 @@ Obsoletes: kdevplatform-libs < 5.1.80-1 %setup -q -n kdevelop-%{version} %patch0 -p1 -b .qmake +%patch10 -p1 -b .do-not-crash-when-showing-tooltip + %build mkdir %{_target_platform} pushd %{_target_platform} @@ -229,6 +232,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desk %{rpm_macros_dir}/macros.kdevelop %changelog +* Mon Feb 17 2020 Jan Grulich - 9:5.5.0-2 +- Do not crash when showing tooltip + * Mon Feb 03 2020 Jan Grulich - 9:5.5.0-1 - 5.5.0