Properly resize columns of child document table widget

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 8fe7ddada216326c915ccf5aaba7871b9f23dcb4..122a4905fe8a6db49ca2a15e7ef501925c3b517f 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -874,8 +874,14 @@ GuiDocument::GuiDocument(GuiView & lv)
        masterChildModule->childrenTW->setColumnCount(2);
        masterChildModule->childrenTW->headerItem()->setText(0, qt_("Child Document"));
        masterChildModule->childrenTW->headerItem()->setText(1, qt_("Include to Output"));
-       masterChildModule->childrenTW->resizeColumnToContents(1);
-       masterChildModule->childrenTW->resizeColumnToContents(2);
+
+#if (QT_VERSION > 0x050000)
+       masterChildModule->childrenTW->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+       masterChildModule->childrenTW->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+#else
+       masterChildModule->childrenTW->header()->setResizeMode(0, QHeaderView::ResizeToContents);
+       masterChildModule->childrenTW->header()->setResizeMode(1, QHeaderView::ResizeToContents);
+#endif
 
 
        // Formats

diff --git a/status.23x b/status.23x
index e7e08f998c2877d9a18a481db999680cae1226fa..f93844e61e5ab156354bc33a25a1c3f60aac4021 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -63,6 +63,8 @@ What's new
 
 - Consider shorthand in biblatex cite display (bug 11696).
 
+- Properly resize columns of child document table widget.
+
 
 * INTERNALS