38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
source: upstream commit
|
|
https://github.com/haiwen/seafile-client/commit/552fb023163db9554eeaa5063bc38a86b01e4e22
|
|
|
|
From 552fb023163db9554eeaa5063bc38a86b01e4e22 Mon Sep 17 00:00:00 2001
|
|
From: sun20121818 <1184550842@qq.com>
|
|
Date: Wed, 3 Jun 2020 11:40:56 +0800
|
|
Subject: [PATCH] support choose qtwebkit or qtwebengine (#1300)
|
|
|
|
---
|
|
CMakeLists.txt | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 4a3e5709..a7735112 100644
|
|
--- CMakeLists.txt
|
|
+++ CMakeLists.txt
|
|
@@ -43,6 +43,8 @@ OPTION(BUILD_SHIBBOLETH_SUPPORT "Build Shibboleth support" OFF)
|
|
|
|
option(BUILD_ENABLE_WARNINGS "Enable compiler warnings." ON)
|
|
|
|
+option(USE_QT_WEBKIT "Build use QT webkit" OFF)
|
|
+
|
|
option(BUILD_SPARKLE_SUPPORT "Build Sparkle support" OFF)
|
|
IF (BUILD_SPARKLE_SUPPORT)
|
|
ADD_DEFINITIONS(-DHAVE_SPARKLE_SUPPORT)
|
|
@@ -164,7 +166,7 @@ EXECUTE_PROCESS(COMMAND
|
|
OUTPUT_VARIABLE DETECTED_QT_VERSION
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
MESSAGE("qt5 version: ${DETECTED_QT_VERSION}")
|
|
-IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)
|
|
+IF(USE_QT_WEBKIT)
|
|
ADD_DEFINITIONS(-DSEAFILE_USE_WEBKIT)
|
|
SET(WEBKIT_NAME "WebKit")
|
|
SET(WEBKIT_WIDGETS_NAME "WebKitWidgets")
|
|
--
|
|
2.27.0
|
|
|