blob: edbef3f8fb9a2c65922bcaba65aecfdb41747626 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
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")
ADD_DEFINITIONS("-DBT_MOBILE")
ENDIF()
-IF(Qt5Core_VERSION VERSION_LESS 5.6.0)
- SET(USEWEBENGINE OFF)
-ELSE()
- SET(USEWEBENGINE ON)
-ENDIF()
-
-IF(USEWEBENGINE)
- ADD_DEFINITIONS("-DUSEWEBENGINE")
-ENDIF()
-
# Define $bibletime_SOURCES
INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake")
@@ -220,8 +210,6 @@ TARGET_LINK_LIBRARIES("bibletime"
IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
qt5_use_modules("bibletime" Widgets WebKitWidgets Qml Quick Xml Network PrintSupport Svg)
-ELSEIF(USEWEBENGINE)
- qt5_use_modules("bibletime" Widgets WebEngine WebEngineWidgets WebChannel Xml Network PrintSupport Svg)
ELSE()
qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network PrintSupport Svg)
ENDIF()
@@ -276,13 +264,8 @@ INSTALL(FILES ${INSTALL_TMPL_LIST}
DESTINATION "${BT_SHARE_PATH}/bibletime/display-templates/")
-IF(USEWEBENGINE)
- INSTALL(FILES "src/frontend/display/btwebengine.js"
- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/")
-ELSE()
- INSTALL(FILES "src/frontend/display/bthtml.js"
- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/")
-ENDIF()
+INSTALL(FILES "src/frontend/display/bthtml.js"
+ DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/")
INSTALL(FILES "docs/license.html"
DESTINATION "${BT_SHARE_PATH}/bibletime/license/")
|