This commit is contained in:
parent
ba63aeaa94
commit
93d679c006
@ -1,4 +1,4 @@
|
|||||||
From 54f1a640704f088645763663d4004ad567689630 Mon Sep 17 00:00:00 2001
|
From bc20a61b530b39a4a0dde9fd69a46fb4b3f27585 Mon Sep 17 00:00:00 2001
|
||||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||||
Date: Mon, 12 Oct 2020 11:46:24 +0200
|
Date: Mon, 12 Oct 2020 11:46:24 +0200
|
||||||
Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with
|
Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with
|
||||||
@ -12,7 +12,8 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
|||||||
cmake/modules/ECMKDE4Macros.cmake | 7 ++++++-
|
cmake/modules/ECMKDE4Macros.cmake | 7 ++++++-
|
||||||
umbrello/CMakeLists.txt | 8 ++++++--
|
umbrello/CMakeLists.txt | 8 ++++++--
|
||||||
umbrello/umlappprivate.h | 13 +++++++++++++
|
umbrello/umlappprivate.h | 13 +++++++++++++
|
||||||
4 files changed, 31 insertions(+), 4 deletions(-)
|
unittests/CMakeLists.txt | 1 -
|
||||||
|
5 files changed, 31 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index d98036c..59873cd 100644
|
index d98036c..59873cd 100644
|
||||||
@ -130,6 +131,18 @@ index a85de1f..a7212cc 100644
|
|||||||
parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
|
parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
|
||||||
|
|
||||||
viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
|
viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
|
||||||
|
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
|
||||||
|
index 08cd43a..e96659f 100644
|
||||||
|
--- a/unittests/CMakeLists.txt
|
||||||
|
+++ b/unittests/CMakeLists.txt
|
||||||
|
@@ -60,7 +60,6 @@ else()
|
||||||
|
Qt5::Xml
|
||||||
|
Qt5::Test
|
||||||
|
Qt5::Widgets
|
||||||
|
- Qt5::WebKitWidgets
|
||||||
|
KF5::I18n
|
||||||
|
KF5::Crash
|
||||||
|
${LIBXML2_LIBRARIES}
|
||||||
--
|
--
|
||||||
2.32.0
|
2.32.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user