fix: disable XLS export in Qt6

because it has been removed from Qt6
Project-LemonLime · Dec 13, 2020 · 48373fb · 48373fb
1 parent 27b1b33
commit 48373fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/BUILD.md b/BUILD.md
@@ -31,7 +31,7 @@ scoop install peach/lemon
 
 当然如果你装有 Qt 5/6，也可以下载源码编译。
 
-NOTE: XLS 导出是默认关闭的，如需使用，请编译时附加 `-DENABLE_XLS_EXPORT` 启用。
+NOTE: XLS 导出是默认关闭的，如需使用，请编译时附加 `-DENABLE_XLS_EXPORT` 启用(Qt6 不可用)。
 
 ### 非常重要的提示
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -248,7 +248,7 @@ endif()
 
 target_include_directories(lemon PUBLIC ${CMAKE_SOURCE_DIR}/src)
 
-if(WIN32 AND ENABLE_XLS_EXPORT)
+if(WIN32 AND ENABLE_XLS_EXPORT NOT LEMON_QT6)
     find_package(${LEMON_QT_LIBNAME} COMPONENTS AxContainer REQUIRED)
     list(APPEND LEMON_QT_LIBS ${LEMON_QT_LIBNAME}::AxContainer)
     add_definitions(-DENABLE_XLS_EXPORT)

diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
@@ -1 +1 @@
-109
+110