diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-06 01:00:08 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-06 20:13:31 +0000 |
| commit | 68c30e372b01561e8809fcfa5426ae896da70b8e (patch) | |
| tree | 68245df2a3616ff0ebf9e132cab0d3c22a586755 /src/tools/uic/option.h | |
| parent | bd4a1b98b813dfbbb4a9db35a380bed8dd5f0ce3 (diff) | |
| parent | 3a010f72b81d530df96bfb04e0dd2f13a527cc18 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/tools/uic/option.h')
| -rw-r--r-- | src/tools/uic/option.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h index 4fc442e94a..8e882079c9 100644 --- a/src/tools/uic/option.h +++ b/src/tools/uic/option.h @@ -45,6 +45,7 @@ struct Option unsigned int limitXPM_LineLength : 1; unsigned int implicitIncludes: 1; unsigned int idBased: 1; + unsigned int fromImports: 1; QString inputFile; QString outputFile; @@ -65,6 +66,7 @@ struct Option limitXPM_LineLength(0), implicitIncludes(1), idBased(0), + fromImports(0), prefix(QLatin1String("Ui_")) { indent.fill(QLatin1Char(' '), 4); } |