Skip to content

Remove further Qt support before Qt 5.15.2 #19824

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

Merged
wing328 merged 3 commits into from
Oct 14, 2024
Merged

Remove further Qt support before Qt 5.15.2 #19824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4f29f1
Remove further Qt support before Qt 5.15.2
Oct 9, 2024
9b77f9f
Merge branch 'OpenAPITools:master' into follow-up-qt-remove-pre-qt-5-…
Oct 13, 2024
6059017
Updates samples to match the mustach config files.
Oct 13, 2024
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
20 changes: 0 additions & 20 deletions modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.cpp.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,7 @@ void {{prefix}}HttpRequestInput::add_file(QString variable_name, QString local_f

{{prefix}}HttpRequestWorker::{{prefix}}HttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager)
: QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) {

#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch());
#else
qsrand(QDateTime::currentDateTime().toTime_t());
#endif

if (manager == nullptr) {
manager = new QNetworkAccessManager(this);
}
Expand Down Expand Up @@ -212,13 +206,8 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) {
// variable layout is MULTIPART

boundary = QString("__-----------------------%1%2")
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
.arg(QDateTime::currentDateTime().toSecsSinceEpoch())
.arg(randomGenerator.generate());
#else
.arg(QDateTime::currentDateTime().toTime_t())
.arg(qrand());
#endif
QString boundary_delimiter = "--";
QString new_line = "\r\n";

Expand Down Expand Up @@ -359,16 +348,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) {
} else if (input->http_method == "DELETE") {
reply = manager->deleteResource(request);
} else {
#if (QT_VERSION >= 0x050800)
reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), request_content);
#else
QBuffer *buffer = new QBuffer;
buffer->setData(request_content);
buffer->open(QIODevice::ReadOnly);

reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), buffer);
buffer->setParent(reply);
#endif
}
if (reply != nullptr) {
reply->setParent(this);
Expand Down
20 changes: 0 additions & 20 deletions samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXHttpRequest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,7 @@ void PFXHttpRequestInput::add_file(QString variable_name, QString local_filename

PFXHttpRequestWorker::PFXHttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager)
: QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) {

#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch());
#else
qsrand(QDateTime::currentDateTime().toTime_t());
#endif

if (manager == nullptr) {
manager = new QNetworkAccessManager(this);
}
Expand Down Expand Up @@ -219,13 +213,8 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
// variable layout is MULTIPART

boundary = QString("__-----------------------%1%2")
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
.arg(QDateTime::currentDateTime().toSecsSinceEpoch())
.arg(randomGenerator.generate());
#else
.arg(QDateTime::currentDateTime().toTime_t())
.arg(qrand());
#endif
QString boundary_delimiter = "--";
QString new_line = "\r\n";

Expand Down Expand Up @@ -366,16 +355,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
} else if (input->http_method == "DELETE") {
reply = manager->deleteResource(request);
} else {
#if (QT_VERSION >= 0x050800)
reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), request_content);
#else
QBuffer *buffer = new QBuffer;
buffer->setData(request_content);
buffer->open(QIODevice::ReadOnly);

reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), buffer);
buffer->setParent(reply);
#endif
}
if (reply != nullptr) {
reply->setParent(this);
Expand Down
20 changes: 0 additions & 20 deletions samples/client/petstore/cpp-qt/client/PFXHttpRequest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,7 @@ void PFXHttpRequestInput::add_file(QString variable_name, QString local_filename

PFXHttpRequestWorker::PFXHttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager)
: QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) {

#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch());
#else
qsrand(QDateTime::currentDateTime().toTime_t());
#endif

if (manager == nullptr) {
manager = new QNetworkAccessManager(this);
}
Expand Down Expand Up @@ -219,13 +213,8 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
// variable layout is MULTIPART

boundary = QString("__-----------------------%1%2")
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
.arg(QDateTime::currentDateTime().toSecsSinceEpoch())
.arg(randomGenerator.generate());
#else
.arg(QDateTime::currentDateTime().toTime_t())
.arg(qrand());
#endif
QString boundary_delimiter = "--";
QString new_line = "\r\n";

Expand Down Expand Up @@ -366,16 +355,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
} else if (input->http_method == "DELETE") {
reply = manager->deleteResource(request);
} else {
#if (QT_VERSION >= 0x050800)
reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), request_content);
#else
QBuffer *buffer = new QBuffer;
buffer->setData(request_content);
buffer->open(QIODevice::ReadOnly);

reply = manager->sendCustomRequest(request, input->http_method.toLatin1(), buffer);
buffer->setParent(reply);
#endif
}
if (reply != nullptr) {
reply->setParent(this);
Expand Down