Port to Qt6

aymara · Apr 19, 2024 · 62b6fe7 · 62b6fe7
1 parent 0402dcd
commit 62b6fe7
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -110,6 +110,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 find_package(Qt6 REQUIRED COMPONENTS Core Network)
 set(Qt6_LIBRARIES  Qt6::Core Qt6::Network )
+qt_standard_project_setup()
 message("Found Qt6 ${Qt6Core_VERSION}")
 
 message("\n\n\n{Qt6_LIBRARIES}=${Qt6_LIBRARIES} ")

diff --git a/Dockerfile-debian12 b/Dockerfile-debian12
@@ -6,7 +6,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Setup
 RUN apt-get update -y -qq && apt-get install -y apt-utils wget bzip2 git gcc g++ cmake cmake-data ninja-build qt6-base-dev-tools qt6-declarative-dev packaging-dev -qq
 RUN mkdir -p /src/
-RUN git clone https://github.com/aymara/qhttpserver /src/qhttpserver
+COPY . /src/qhttpserver
+#RUN git clone https://github.com/aymara/qhttpserver /src/qhttpserver
 
 RUN mkdir -p /src/qhttpserver/build
 

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_subdirectory(helloworld)
-add_subdirectory(greeting)
+# add_subdirectory(greeting)
 #add_subdirectory(bodydata)
diff --git a/examples/bodydata/CMakeLists.txt b/examples/bodydata/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(œ_EXE_SRCS
 
 add_executable(bodydata_server ${bodydata_EXE_SRCS})
 
-target_link_libraries(bodydata_server qhttpserver ${Qt5_LIBRARIES})
+target_link_libraries(bodydata_server qhttpserver ${Qt6_LIBRARIES})
 
 add_test(
   NAME bodydata_Test

diff --git a/examples/greeting/CMakeLists.txt b/examples/greeting/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(greeting_EXE_SRCS
 
 add_executable(greeting_server ${greeting_EXE_SRCS})
 
-target_link_libraries(greeting_server qhttpserver ${Qt5_LIBRARIES})
+target_link_libraries(greeting_server qhttpserver ${Qt6_LIBRARIES})
 
 add_test(
   NAME greeting_Test

diff --git a/examples/helloworld/CMakeLists.txt b/examples/helloworld/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(helloworld_EXE_SRCS
 
 add_executable(helloworld_server ${helloworld_EXE_SRCS})
 
-target_link_libraries(helloworld_server qhttpserver ${Qt5_LIBRARIES})
+target_link_libraries(helloworld_server qhttpserver ${Qt6_LIBRARIES})
 
 add_test(
   NAME helloworld_Test

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(qhttpserver_LIB_SRCS
 
 add_library(qhttpserver SHARED ${qhttpserver_LIB_SRCS})
 
-target_link_libraries(qhttpserver ${Qt5_LIBRARIES})
+target_link_libraries(qhttpserver ${Qt6_LIBRARIES})
 
 install(TARGETS qhttpserver DESTINATION ${LIB_INSTALL_DIR})
 

diff --git a/src/qhttprequest.h b/src/qhttprequest.h
@@ -46,7 +46,7 @@ class QHTTPSERVER_API QHttpRequest : public QObject
     Q_PROPERTY(HeaderHash headers READ headers)
     Q_PROPERTY(QString remoteAddress READ remoteAddress)
     Q_PROPERTY(quint16 remotePort READ remotePort)
-    Q_PROPERTY(QString method READ method)
+    Q_PROPERTY(QString method READ methodString)
     Q_PROPERTY(QUrl url READ url)
     Q_PROPERTY(QString path READ path)
     Q_PROPERTY(QString httpVersion READ httpVersion)