diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-12 13:20:40 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-01 16:29:15 +0200 |
commit | de15836dbf5007092c19bc9ab15ca3d1a36901ad (patch) | |
tree | 38e4b642d31bb633f2efa3b316cfcd1dfbaca7e3 /src/tools/uic/main.cpp | |
parent | b42e2d70fbda5afb462b869583b925ad5f1a5480 (diff) |
uic: No longer generate star imports in Python
Use class WriteIncludesBase and store classes encountered in a
per-module hash (Qt/custom widgets). Write out only the required
classes.
Add --star-import as a fallback should the change cause issues.
Task-number: PYSIDE-1404
Change-Id: Ic50e26758ddd0f2f8aebbce470d32a36fb09a2c4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'src/tools/uic/main.cpp')
-rw-r--r-- | src/tools/uic/main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp index cb21277086..4a5f0ea309 100644 --- a/src/tools/uic/main.cpp +++ b/src/tools/uic/main.cpp @@ -112,6 +112,11 @@ int runUic(int argc, char *argv[]) fromImportsOption.setDescription(QStringLiteral("Python: generate imports relative to '.'")); parser.addOption(fromImportsOption); + // FIXME Qt 7: Remove? + QCommandLineOption useStarImportsOption(QStringLiteral("star-imports")); + useStarImportsOption.setDescription(QStringLiteral("Python: Use * imports")); + parser.addOption(useStarImportsOption); + parser.addPositionalArgument(QStringLiteral("[uifile]"), QStringLiteral("Input file (*.ui), otherwise stdin.")); parser.process(app); @@ -123,6 +128,7 @@ int runUic(int argc, char *argv[]) driver.option().implicitIncludes = !parser.isSet(noImplicitIncludesOption); driver.option().idBased = parser.isSet(idBasedOption); driver.option().fromImports = parser.isSet(fromImportsOption); + driver.option().useStarImports = parser.isSet(useStarImportsOption); driver.option().postfix = parser.value(postfixOption); driver.option().translateFunction = parser.value(translateOption); driver.option().includeFile = parser.value(includeOption); |