uic - fix to handle QTreeWidget with empty header(s)

This makes it possible for uic to handle QTreeWidget that in
the designer has one or more empty headers.

Before the right(most) empty items where there wasn't a
non-empty header to the right of them would not be visible.

The other empty items - where there was a header to the
right of it would not be empty but initialized with a number.

This patch ensures the same behavior that the QTableWidget
is having.

Task-number: QTBUG-18156

Change-Id: I19bfd3307befe46a1af2d6a3275f7446a15b3442
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 38d6782e83..35431bac1e 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -2159,6 +2159,12 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w)
 
         const DomPropertyMap properties = propertyMap(column->elementProperty());
         addCommonInitializers(&item, properties, i);
+
+        if (const DomProperty *p = properties.value(QLatin1String("text"))) {
+            DomString *str = p->elementString();
+            if (str && str->text().isEmpty())
+                m_output << m_indent << varName << "->headerItem()->setText(" << i << ", QString());\n";
+        }
     }
     const QString itemName = item.writeSetupUi(QString(), Item::DontConstruct);
     item.writeRetranslateUi(varName + QLatin1String("->headerItem()"));