QAbstractScrollArea - add SizeAdjustPolicy and viewportSizeHint

This patch adds SizeAdjustPolicy to QAbstractScrollArea.
If it is set to AdjustToContents it will make use of the new
protected viewportSizeHint() (BC since it was reserved in Qt5).
This function returns a suggested size based on contents.

Change-Id: I5d8aa517e88b8b21c5712e62b4d574c3aad99d3b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

1 files changed, 26 insertions, 9 deletions

diff --git a/tests/manual/widgets/itemviews/qtreeview/main.cpp b/tests/manual/widgets/itemviews/qtreeview/main.cpp
index 296ba6bcbf..22b4e07f75 100644
--- a/tests/manual/widgets/itemviews/qtreeview/main.cpp
+++ b/tests/manual/widgets/itemviews/qtreeview/main.cpp
@@ -39,17 +39,34 @@
 **
 ****************************************************************************/
 
-
-#include <QtWidgets/QFileSystemModel>
-#include <QtWidgets/QtWidgets>
+#include <QtWidgets>
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    QFileSystemModel *model = new QFileSystemModel;
-    model->setRootPath(QDir::currentPath());
-    QTreeView *tree = new QTreeView();
-    tree->setModel(model);
-    tree->show();
-    app.exec();
+    QFileSystemModel model;
+    QWidget window;
+    QTreeView *tree = new QTreeView(&window);
+    tree->setMaximumSize(1000, 600);
+
+    QHBoxLayout *layout = new QHBoxLayout;
+    layout->setSizeConstraint(QLayout::SetFixedSize);
+    layout->addWidget(tree);
+
+    window.setLayout(layout);
+    model.setRootPath("");
+    tree->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+    tree->setModel(&model);
+
+    tree->setAnimated(false);
+    tree->setIndentation(20);
+    tree->setSortingEnabled(true);
+    tree->header()->setStretchLastSection(false);
+
+    window.setWindowTitle(QObject::tr("Dir View"));
+    tree->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+
+    window.show();
+
+    return app.exec();
 }