Skip to content

Commit 48373fb

Browse files
fix: disable XLS export in Qt6
because it has been removed from Qt6
1 parent 27b1b33 commit 48373fb

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

BUILD.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ scoop install peach/lemon
3131

3232
当然如果你装有 Qt 5/6,也可以下载源码编译。
3333

34-
NOTE: XLS 导出是默认关闭的,如需使用,请编译时附加 `-DENABLE_XLS_EXPORT` 启用。
34+
NOTE: XLS 导出是默认关闭的,如需使用,请编译时附加 `-DENABLE_XLS_EXPORT` 启用(Qt6 不可用)
3535

3636
### 非常重要的提示
3737

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ endif()
248248

249249
target_include_directories(lemon PUBLIC ${CMAKE_SOURCE_DIR}/src)
250250

251-
if(WIN32 AND ENABLE_XLS_EXPORT)
251+
if(WIN32 AND ENABLE_XLS_EXPORT NOT LEMON_QT6)
252252
find_package(${LEMON_QT_LIBNAME} COMPONENTS AxContainer REQUIRED)
253253
list(APPEND LEMON_QT_LIBS ${LEMON_QT_LIBNAME}::AxContainer)
254254
add_definitions(-DENABLE_XLS_EXPORT)

makespec/BUILDVERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
109
1+
110

0 commit comments

Comments
 (0)