From d74de789f52ae468638846dbec3f51edc12b7873 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 13 Mar 2017 14:47:30 +0100
Subject: [PATCH] Put the QPrivateSignal argument in the args array

Fix for QTBUG-59414
---
 src/generator.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/generator.cpp b/src/generator.cpp
index f2ec706..4c13fe2 100644
--- a/src/generator.cpp
+++ b/src/generator.cpp
@@ -1146,8 +1146,7 @@ void Generator::GenerateSignal(const clang::CXXMethodDecl *MD, int Idx)
     for (uint j = 0 ; j < MD->getNumParams(); ++j) {
         if (j) OS_TemplateHeader << ",";
         OS_TemplateHeader << MD->getParamDecl(j)->getType().getAsString(PrintPolicy);
-        if (!(j == MD->getNumParams() - 1 && HasPrivateSignal(MD)))
-            OS_TemplateHeader << " _t" << (j+1);;
+        OS_TemplateHeader << " _t" << (j+1);;
     }
     OS_TemplateHeader << ")";
     std::string This = "this";
@@ -1160,7 +1159,6 @@ void Generator::GenerateSignal(const clang::CXXMethodDecl *MD, int Idx)
     OS_TemplateHeader << "\n{\n";
     bool IsVoid = ReturnType->isVoidType();
     unsigned int NumParam = MD->getNumParams();
-    if (HasPrivateSignal(MD)) NumParam--;
     if (IsVoid && NumParam == 0) {
         OS_TemplateHeader << "    QMetaObject::activate(" << This << ", &staticMetaObject, " << Idx << ", 0);\n";
     } else {