diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-01-08 17:39:56 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-01-15 15:50:00 +0000 |
| commit | 058474884c2505a8a00d4c59b4922bfcd3597c2f (patch) | |
| tree | af250e2d486f0fb7aed9a6e999bca7ab88d3dd50 /src/tools | |
| parent | 1d86e5f84abac6db0b7b1503a6f52c72b272a897 (diff) | |
Don't generate QHeaderView include unconditionally
Generate it only when needed.
Change-Id: I7a89b18ec0f2ee7d55fcad1b3f9701269d7616ec
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteincludes.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index de64b85219..809cac6bef 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -109,7 +109,6 @@ void WriteIncludes::acceptUI(DomUI *node) add(QLatin1String("QAction")); add(QLatin1String("QButtonGroup")); // ### only if it is really necessary - add(QLatin1String("QHeaderView")); TreeWalker::acceptUI(node); @@ -212,6 +211,14 @@ void WriteIncludes::add(const QString &className, bool determineHeader, const QS m_knownClasses.insert(className); + const CustomWidgetsInfo *cwi = m_uic->customWidgetsInfo(); + if (cwi->extends(className, QLatin1String("QTreeView")) + || cwi->extends(className, QLatin1String("QTreeWidget")) + || cwi->extends(className, QLatin1String("QTableView")) + || cwi->extends(className, QLatin1String("QTableWidget"))) { + add(QLatin1String("QHeaderView")); + } + if (!m_laidOut && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBox"))) add(QLatin1String("QLayout")); // spacing property of QToolBox) |