CL-Softwares
/
QRedis
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modified to Qt6 and first commit to ssh://git@server.baseware.net:2222/CL-Softwares/QRedis.git

This commit is contained in:
JesseQu 2024-08-09 09:56:46 +08:00
parent 953316e4d0
commit bdb13d9e36
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -18,3 +18,4 @@ moc_*.cpp
qrc_*.cpp qrc_*.cpp
Makefile Makefile
*-build-* *-build-*
build/

8
CMakeLists.txt
View File

@ -13,8 +13,8 @@ set(QREDIS_PATCH 0)
set(QREDIS_VERSION "${QREDIS_MAJOR}.${QREDIS_MINOR}.${QREDIS_PATCH}") set(QREDIS_VERSION "${QREDIS_MAJOR}.${QREDIS_MINOR}.${QREDIS_PATCH}")
# The QtCore and QtNetwork libraries are both required. # The QtCore and QtNetwork libraries are both required.
find_package(Qt5Core REQUIRED) find_package(Qt6Core REQUIRED)
find_package(Qt5Network REQUIRED) find_package(Qt6Network REQUIRED)
# Specify where QRedis includes are located. # Specify where QRedis includes are located.
include_directories(include) include_directories(include)
@ -27,7 +27,7 @@ set(QREDIS_SRC
src/request.cpp) src/request.cpp)
# QRedis header files requiring MOC. # QRedis header files requiring MOC.
qt5_wrap_cpp(QREDIS_MOC qt6_wrap_cpp(QREDIS_MOC
include/qredis/client.h include/qredis/client.h
include/qredis/request.h include/qredis/request.h
src/client_p.h src/client_p.h
@ -46,7 +46,7 @@ set_target_properties(qredis PROPERTIES
SOVERSION ${QREDIS_MAJOR}) SOVERSION ${QREDIS_MAJOR})
# This causes the appropriate libraries to be included in the link process. # This causes the appropriate libraries to be included in the link process.
qt5_use_modules(qredis Core Network) target_link_libraries(qredis Qt6::Core Qt6::Network)
# Specify the proper installation paths. # Specify the proper installation paths.
install(TARGETS qredis install(TARGETS qredis

2
README.md
View File

@ -1,6 +1,6 @@
## QRedis ## QRedis
QRedis provides a modern Qt client library for communicating with a [Redis server](http://redis.io/). The code compiles exclusively with Qt 5, ensuring years of compatibility down the road. QRedis provides a modern Qt client library for communicating with a [Redis server](http://redis.io/). The code compiles exclusively with Qt 5, ensuring years of compatibility down the road. Modified with Qt 6 compatibility by Jesse Qu.
### Requirements ### Requirements

6
tests/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# The QtTest libraries are required for building the tests. # The QtTest libraries are required for building the tests.
find_package(Qt5Test REQUIRED) find_package(Qt6Test REQUIRED)
# Specify the source files for the tests. # Specify the source files for the tests.
set(QREDIS_TESTS_SRC set(QREDIS_TESTS_SRC
@ -7,7 +7,7 @@ set(QREDIS_TESTS_SRC
testclient.cpp) testclient.cpp)
# Specify the files that need to be MOC'd. # Specify the files that need to be MOC'd.
qt5_wrap_cpp(QREDIS_TESTS_MOC qt6_wrap_cpp(QREDIS_TESTS_MOC
testclient.h) testclient.h)
# Create the test executable. # Create the test executable.
@ -16,7 +16,7 @@ add_executable(qredis-tests
${QREDIS_TESTS_MOC}) ${QREDIS_TESTS_MOC})
# Specify the Qt modules the test executable links against. # Specify the Qt modules the test executable links against.
qt5_use_modules(qredis-tests Core Test) target_link_libraries(qredis-tests Qt6::Core Qt6::Test)
# Naturally, we also link against the QRedis library. # Naturally, we also link against the QRedis library.
target_link_libraries(qredis-tests qredis) target_link_libraries(qredis-tests qredis)