Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 5 insertions, 0 deletions

diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index 853538479f..6f342fb398 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -104,6 +104,10 @@ int runUic(int argc, char *argv[])
     idBasedOption.setDescription(QStringLiteral("Use id based function for i18n"));
     parser.addOption(idBasedOption);
 
+    QCommandLineOption fromImportsOption(QStringLiteral("from-imports"));
+    fromImportsOption.setDescription(QStringLiteral("Python: generate imports relative to '.'"));
+    parser.addOption(fromImportsOption);
+
     parser.addPositionalArgument(QStringLiteral("[uifile]"), QStringLiteral("Input file (*.ui), otherwise stdin."));
 
     parser.process(app);
@@ -114,6 +118,7 @@ int runUic(int argc, char *argv[])
     driver.option().headerProtection = !parser.isSet(noProtOption);
     driver.option().implicitIncludes = !parser.isSet(noImplicitIncludesOption);
     driver.option().idBased = parser.isSet(idBasedOption);
+    driver.option().fromImports = parser.isSet(fromImportsOption);
     driver.option().postfix = parser.value(postfixOption);
     driver.option().translateFunction = parser.value(translateOption);
     driver.option().includeFile = parser.value(includeOption);