summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/main.cpp
diff options
context:
space:
mode:
authorPavel Geiger <pavel.geiger@gmail.com>2016-01-05 13:05:47 +0100
committerJarek Kobus <jaroslaw.kobus@theqtcompany.com>2016-01-28 14:07:43 +0000
commiteedf16c96fc9f3307087837785202ec3296df213 (patch)
tree8496f958111e9298ee65527655e8843b5377dda5 /src/tools/uic/main.cpp
parenteea8494fa09db99745ef795557aaf1cdba2bd925 (diff)
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>
Diffstat (limited to 'src/tools/uic/main.cpp')
-rw-r--r--src/tools/uic/main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index d86ce28451..229e2a9c2f 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -95,6 +95,10 @@ int runUic(int argc, char *argv[])
generatorOption.setValueName(QStringLiteral("java|cpp"));
parser.addOption(generatorOption);
+ QCommandLineOption idBasedOption(QStringLiteral("idbased"));
+ idBasedOption.setDescription(QStringLiteral("Use id based function for i18n"));
+ parser.addOption(idBasedOption);
+
parser.addPositionalArgument(QStringLiteral("[uifile]"), QStringLiteral("Input file (*.ui), otherwise stdin."));
parser.process(app);
@@ -103,6 +107,7 @@ int runUic(int argc, char *argv[])
driver.option().outputFile = parser.value(outputOption);
driver.option().headerProtection = !parser.isSet(noProtOption);
driver.option().implicitIncludes = !parser.isSet(noImplicitIncludesOption);
+ driver.option().idBased = parser.isSet(idBasedOption);
driver.option().postfix = parser.value(postfixOption);
driver.option().translateFunction = parser.value(translateOption);
driver.option().includeFile = parser.value(includeOption);