From d81dfa5f50dd62b8ceaea92139f2452ec7a22399 Mon Sep 17 00:00:00 2001
From: Wiebe Cazemier <wiebe@halfgaar.net>
Date: Wed, 22 Apr 2020 22:17:01 +0200
Subject: [PATCH] Make it work with Qt5.12

---
 .gitignore              | 1 +
 CMakeLists.txt          | 6 ++++--
 src/qfcgi/fdbuilder.cpp | 2 +-
 src/qfcgi/request.cpp   | 4 ++--
 test/CMakeLists.txt     | 6 +++---
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0ab36af..2a655da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 doc/
 build/
+*.user
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ee557c..9fdf692 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 2.6)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-find_package(Qt4 REQUIRED QtCore QtNetwork)
+find_package(Qt5 REQUIRED Core Network Test)
 
 if (NOT DISABLE_TESTING)
   enable_testing()
@@ -32,6 +32,8 @@ endif(NOT DISABLE_EXAMPLE)
 
 add_definitions(-Wall -Werror)
 
+set(ENABLE_DEBUG ON)
+
 if (ENABLE_DEBUG)
   add_definitions(-g -O0)
 else(ENABLE_DEBUG)
@@ -59,7 +61,7 @@ add_library(qfcgi
   src/qfcgi/tcpbuilder.h
 )
 
-target_link_libraries(qfcgi Qt4::QtCore Qt4::QtNetwork)
+target_link_libraries(qfcgi Qt5::Core Qt5::Network)
 
 install(TARGETS qfcgi
   ARCHIVE DESTINATION lib
diff --git a/src/qfcgi/fdbuilder.cpp b/src/qfcgi/fdbuilder.cpp
index 2eab471..624cc99 100644
--- a/src/qfcgi/fdbuilder.cpp
+++ b/src/qfcgi/fdbuilder.cpp
@@ -39,7 +39,7 @@ QFCgiFdConnectionBuilder::~QFCgiFdConnectionBuilder() {
 bool QFCgiFdConnectionBuilder::listen() {
   this->notifier = new QSocketNotifier(fd, QSocketNotifier::Read, this);
   connect(this->notifier, SIGNAL(activated(int)), this, SLOT(onActivated(int)));
-  qDebug("FastCGI application started, listening on %d", this->notifier->socket());
+  qDebug("FastCGI application started, listening on %llu", this->notifier->socket());
   return true;
 }
 
diff --git a/src/qfcgi/request.cpp b/src/qfcgi/request.cpp
index 0bc0a97..3a5a335 100644
--- a/src/qfcgi/request.cpp
+++ b/src/qfcgi/request.cpp
@@ -81,7 +81,7 @@ QIODevice* QFCgiRequest::getErr() const {
   return this->err;
 }
 
-void QFCgiRequest::onOutBytesWritten(qint64 bytes __unused) {
+void QFCgiRequest::onOutBytesWritten(qint64 bytes) {
   QByteArray &ba = this->out->getBuffer();
   int nbytes = qMin(65535, ba.size());
 
@@ -92,7 +92,7 @@ void QFCgiRequest::onOutBytesWritten(qint64 bytes __unused) {
   connection->send(record);
 }
 
-void QFCgiRequest::onErrBytesWritten(qint64 bytes __unused) {
+void QFCgiRequest::onErrBytesWritten(qint64 bytes) {
   QByteArray &ba = this->err->getBuffer();
   int nbytes = qMin(65535, ba.size());
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d185231..e9e09db 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,13 +16,13 @@
 ##
 
 add_executable(test_stream stream.cpp test_stream.h)
-target_link_libraries(test_stream Qt4::QtTest qfcgi)
+target_link_libraries(test_stream Qt5::Test qfcgi)
 
 add_executable(test_record record.cpp)
-target_link_libraries(test_record Qt4::QtTest qfcgi)
+target_link_libraries(test_record Qt5::Test qfcgi)
 
 add_executable(test_request request.cpp)
-target_link_libraries(test_request Qt4::QtTest qfcgi)
+target_link_libraries(test_request Qt5::Test qfcgi)
 
 add_test(stream test_stream)
 add_test(record test_record)