forked from pool/marble
be5b2d49be
- Add Port-to-QtWebEngine.patch and build with QtWebEngine instead of QtWebKit where possible - Drop QtWebKit BuildRequires, no longer supported - Add Fix-MarbleConfig.cmake-to-find-QtWebEngine.patch to fix building against marble when QtWebEngine is used - Add necessary requirements to the devel package OBS-URL: https://build.opensuse.org/request/show/643651 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=165
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From b8db30a58396060034ac76aa5f7d408b6c467d5f Mon Sep 17 00:00:00 2001
|
|
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
|
|
Date: Fri, 19 Oct 2018 17:40:43 +0200
|
|
Subject: Fix MarbleConfig.cmake file to update to port to QtWebEngine
|
|
|
|
---
|
|
src/lib/marble/MarbleConfig.cmake.in | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/lib/marble/MarbleConfig.cmake.in b/src/lib/marble/MarbleConfig.cmake.in
|
|
index 4f6fc17..ec39b79 100644
|
|
--- a/src/lib/marble/MarbleConfig.cmake.in
|
|
+++ b/src/lib/marble/MarbleConfig.cmake.in
|
|
@@ -8,13 +8,15 @@ if (_CMakeFindDependencyMacro_FOUND)
|
|
find_dependency(Qt5Xml @REQUIRED_QT_VERSION@)
|
|
find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
|
|
if (NOT MARBLE_NO_WEBKITWIDGETS)
|
|
- find_dependency(Qt5WebKitWidgets @REQUIRED_QT_VERSION@)
|
|
+ find_dependency(Qt5WebEngine @REQUIRED_QT_VERSION@)
|
|
+ find_dependency(Qt5WebEngineWidgets @REQUIRED_QT_VERSION@)
|
|
endif()
|
|
else()
|
|
find_package(Qt5Xml REQUIRED)
|
|
find_package(Qt5Widgets REQUIRED)
|
|
if (NOT MARBLE_NO_WEBKITWIDGETS)
|
|
- find_package(Qt5WebKitWidgets REQUIRED)
|
|
+ find_package(Qt5WebEngine REQUIRED)
|
|
+ find_package(Qt5WebEngineWidgets REQUIRED)
|
|
endif()
|
|
endif()
|
|
|
|
--
|
|
cgit v0.11.2
|
|
|