diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/HttpRequest.cpp b/modules/swagger-codegen/src/main/resources/qt5cpp/HttpRequest.cpp
index b56004e8f51..f1e79c4d197 100644
--- a/modules/swagger-codegen/src/main/resources/qt5cpp/HttpRequest.cpp
+++ b/modules/swagger-codegen/src/main/resources/qt5cpp/HttpRequest.cpp
@@ -103,6 +103,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
     response = "";
     error_type = QNetworkReply::NoError;
     error_str = "";
+    bool isFormData = false;
 
 
     // decide on the variable layout
@@ -124,6 +125,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
 
         if (input->vars.count() > 0) {
             bool first = true;
+            isFormData = true;
             foreach (QString key, input->vars.keys()) {
                 if (!first) {
                     request_content.append("&");
@@ -250,7 +252,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
         request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str());
     }
 
-    if (request_content.size() > 0) {
+    if (request_content.size() > 0 && !isFormData) {
         request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     }
     else if (input->var_layout == URL_ENCODED) {
diff --git a/samples/client/petstore/qt5cpp/PetStore/PetApiTests.cpp b/samples/client/petstore/qt5cpp/PetStore/PetApiTests.cpp
index e5670fa4e00..829fbe92640 100644
--- a/samples/client/petstore/qt5cpp/PetStore/PetApiTests.cpp
+++ b/samples/client/petstore/qt5cpp/PetStore/PetApiTests.cpp
@@ -44,7 +44,6 @@ void PetApiTests::getPetByIdTest() {
     timer.setSingleShot(true);
 
     auto validator = [](SWGPet* pet) {
-        qDebug() << pet->asJson();
         QVERIFY(pet->getId() == 3);
         loop.quit();
     };
diff --git a/samples/client/petstore/qt5cpp/client/SWGHttpRequest.cpp b/samples/client/petstore/qt5cpp/client/SWGHttpRequest.cpp
index b56004e8f51..f1e79c4d197 100644
--- a/samples/client/petstore/qt5cpp/client/SWGHttpRequest.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGHttpRequest.cpp
@@ -103,6 +103,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
     response = "";
     error_type = QNetworkReply::NoError;
     error_str = "";
+    bool isFormData = false;
 
 
     // decide on the variable layout
@@ -124,6 +125,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
 
         if (input->vars.count() > 0) {
             bool first = true;
+            isFormData = true;
             foreach (QString key, input->vars.keys()) {
                 if (!first) {
                     request_content.append("&");
@@ -250,7 +252,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
         request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str());
     }
 
-    if (request_content.size() > 0) {
+    if (request_content.size() > 0 && !isFormData) {
         request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     }
     else if (input->var_layout == URL_ENCODED) {