diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-07 08:34:53 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-07 08:34:53 +0100 |
| commit | 75391511ff75d6999822cda9f699da585f49ad37 (patch) | |
| tree | 566dbd70ca624e733025a68612a95aaade463bba /src/tools/uic/option.h | |
| parent | fd9b0b86bb5f78ffa855409c4dd5976505ef83f5 (diff) | |
| parent | 68c30e372b01561e8809fcfa5426ae896da70b8e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia2ce994c42adc010c453edaeea57f672556958f6
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); } |