From eedf16c96fc9f3307087837785202ec3296df213 Mon Sep 17 00:00:00 2001
From: Pavel Geiger <pavel.geiger@gmail.com>
Date: Tue, 5 Jan 2016 13:05:47 +0100
Subject: uic: Accept an -idbased argument

When we want to use qtTrId function instead QApplication::translate in
generated files it's not possible to use custom function with presented by
the --tr argument due to signature difference between qtTrId and
QApplication::translate function.

With this argument present, uic will generate qtTrId function with second
argument empty. When used together with --tr parameter it will use
presented function instead.

Change-Id: I0d986e4ea25ce58917fd9a2866b1eac0a4671502
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
---
 src/tools/uic/cpp/cppwriteinitialization.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 4ad4f60ca85..29a377984c1 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -2309,18 +2309,25 @@ QString WriteInitialization::trCall(const QString &str, const QString &commentHi
     const QString comment = commentHint.isEmpty() ? QString(QLatin1Char('0')) : fixString(commentHint, m_dindent);
 
     if (m_option.translateFunction.isEmpty()) {
-        result = QLatin1String("QApplication::translate(\"");
-        result += m_generatedClass;
-        result += QLatin1Char('"');
-        result += QLatin1String(", ");
+        if (m_option.idBased) {
+            result = QLatin1String("qtTrId(");
+        } else {
+            result = QLatin1String("QApplication::translate(\"");
+            result += m_generatedClass;
+            result += QLatin1Char('"');
+            result += QLatin1String(", ");
+        }
     } else {
         result = m_option.translateFunction;
         result += QLatin1Char('(');
     }
 
     result += fixString(str, m_dindent);
-    result += QLatin1String(", ");
-    result += comment;
+
+    if (!m_option.idBased) {
+        result += QLatin1String(", ");
+        result += comment;
+    }
 
     result += QLatin1Char(')');
     return result;
-- 
cgit v1.2.3