Skip to content

Make it work with Qt5.12 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
halfgaar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make it work with Qt5.12 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
doc/
build/
*.user
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/qfcgi/fdbuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions src/qfcgi/request.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand All @@ -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());

Expand Down
6 changes: 3 additions & 3 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down