mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2025-01-24 06:32:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfixes for QT5 build after QT6 modifications

Browse Source
This commit is contained in:
jkriege2 2022-04-22 13:32:24 +02:00
parent 0a5fa42470
commit 687c23a654
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/jkqtplotter_deployqt.cmake
View File

@ -11,17 +11,6 @@ function(jkqtplotter_deployqt TARGET_NAME)
endif()
if(${QT_VERSION_MAJOR} VERSION_GREATER_EQUAL "6")
set(WINDEPLOYQTOPTION "")
set(WINDEPLOYQTPACKAGES "")
else()
set(WINDEPLOYQTOPTION "--release --compiler-runtime")
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(WINDEPLOYQTOPTION "--debug --compiler-runtime")
endif()
set(WINDEPLOYQTPACKAGES "-xml -printsupport -svg -opengl")
endif()
# install system runtime lib
include( InstallRequiredSystemLibraries )
@ -31,7 +20,7 @@ function(jkqtplotter_deployqt TARGET_NAME)
get_filename_component(CMAKE_CXX_COMPILER_BINPATH ${CMAKE_CXX_COMPILER} DIRECTORY )
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" ${WINDEPLOYQTOPTION} ${WINDEPLOYQTPACKAGES} \"$<TARGET_FILE:${TARGET_NAME}>\"
COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$<TARGET_FILE:${TARGET_NAME}>\"
COMMENT "Running windeployqt ... "
)
endif(WIN32)

2
lib/jkqtcommon/jkqttools.cpp
View File

@ -274,6 +274,6 @@ quint16 jkqtp_checksum(const void *data, size_t len)
#if QT_VERSION>=QT_VERSION_CHECK(6,0,0)
return qChecksum(QByteArrayView(static_cast<const uint8_t*>(data), len));
#else
return qChecksum(data, len);
return qChecksum(static_cast<const char*>(data), len);
#endif
}