summaryrefslogtreecommitdiff
path: root/libre/bibletime/libre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/bibletime/libre.patch')
-rw-r--r--libre/bibletime/libre.patch14
1 files changed, 9 insertions, 5 deletions
diff --git a/libre/bibletime/libre.patch b/libre/bibletime/libre.patch
index edbef3f8f..38a041152 100644
--- a/libre/bibletime/libre.patch
+++ b/libre/bibletime/libre.patch
@@ -2,13 +2,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50c7391db..30a58e34f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -150,16 +150,6 @@ IF("${BIBLETIME_FRONTEND}" STREQUAL "MOBILE")
+@@ -150,19 +150,8 @@ IF("${BIBLETIME_FRONTEND}" STREQUAL "MOBILE")
ADD_DEFINITIONS("-DBT_MOBILE")
ENDIF()
--IF(Qt5Core_VERSION VERSION_LESS 5.6.0)
-- SET(USEWEBENGINE OFF)
+-FIND_PACKAGE(Qt5WebEngine QUIET)
+-IF(NOT Qt5WebEngine_FOUND)
+ MESSAGE(STATUS "Using Qt WebKit")
+ SET(USEWEBENGINE OFF)
-ELSE()
+- MESSAGE(STATUS "Using Qt WebEngine")
- SET(USEWEBENGINE ON)
-ENDIF()
-
@@ -19,7 +22,7 @@ index 50c7391db..30a58e34f 100644
# Define $bibletime_SOURCES
INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake")
-@@ -220,8 +210,6 @@ TARGET_LINK_LIBRARIES("bibletime"
+@@ -223,8 +212,6 @@ TARGET_LINK_LIBRARIES("bibletime"
IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
qt5_use_modules("bibletime" Widgets WebKitWidgets Qml Quick Xml Network PrintSupport Svg)
@@ -28,7 +31,8 @@ index 50c7391db..30a58e34f 100644
ELSE()
qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network PrintSupport Svg)
ENDIF()
-@@ -276,13 +264,8 @@ INSTALL(FILES ${INSTALL_TMPL_LIST}
+
+@@ -279,13 +267,8 @@ INSTALL(FILES ${INSTALL_TMPL_LIST}
DESTINATION "${BT_SHARE_PATH}/bibletime/display-templates/")