diff --git a/cmake/jkqtplotter_deployqt.cmake b/cmake/jkqtplotter_deployqt.cmake index ac1f937865..a5a0da526c 100644 --- a/cmake/jkqtplotter_deployqt.cmake +++ b/cmake/jkqtplotter_deployqt.cmake @@ -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} \"$\" + COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$\" COMMENT "Running windeployqt ... " ) endif(WIN32) diff --git a/lib/jkqtcommon/jkqttools.cpp b/lib/jkqtcommon/jkqttools.cpp index cfd8ab54f6..59c95d43b8 100644 --- a/lib/jkqtcommon/jkqttools.cpp +++ b/lib/jkqtcommon/jkqttools.cpp @@ -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(data), len)); #else - return qChecksum(data, len); + return qChecksum(static_cast(data), len); #endif }