mirror of
https://github.com/jkriege2/JKQtPlotter.git
synced 2025-01-24 06:32:12 +08:00
bugfixes for QT5 build after QT6 modifications
This commit is contained in:
parent
0a5fa42470
commit
687c23a654
@ -11,17 +11,6 @@ function(jkqtplotter_deployqt TARGET_NAME)
|
|||||||
endif()
|
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
|
# install system runtime lib
|
||||||
include( InstallRequiredSystemLibraries )
|
include( InstallRequiredSystemLibraries )
|
||||||
@ -31,7 +20,7 @@ function(jkqtplotter_deployqt TARGET_NAME)
|
|||||||
|
|
||||||
get_filename_component(CMAKE_CXX_COMPILER_BINPATH ${CMAKE_CXX_COMPILER} DIRECTORY )
|
get_filename_component(CMAKE_CXX_COMPILER_BINPATH ${CMAKE_CXX_COMPILER} DIRECTORY )
|
||||||
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
|
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 ... "
|
COMMENT "Running windeployqt ... "
|
||||||
)
|
)
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
|
@ -274,6 +274,6 @@ quint16 jkqtp_checksum(const void *data, size_t len)
|
|||||||
#if QT_VERSION>=QT_VERSION_CHECK(6,0,0)
|
#if QT_VERSION>=QT_VERSION_CHECK(6,0,0)
|
||||||
return qChecksum(QByteArrayView(static_cast<const uint8_t*>(data), len));
|
return qChecksum(QByteArrayView(static_cast<const uint8_t*>(data), len));
|
||||||
#else
|
#else
|
||||||
return qChecksum(data, len);
|
return qChecksum(static_cast<const char*>(data), len);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user