Merge branch 'stable' into dev

Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9

4 files changed, 48 insertions, 0 deletions

diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index c67478cfae..e576259d1a 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -70,6 +70,14 @@
         QCOMPARE(expr, expected); \
     } while(0)
 
+static inline void setFrameless(QWidget *w)
+{
+    Qt::WindowFlags flags = w->windowFlags();
+    flags |= Qt::FramelessWindowHint;
+    flags &= ~(Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+    w->setWindowFlags(flags);
+}
+
 class TestView : public QAbstractItemView
 {
     Q_OBJECT
@@ -622,6 +630,7 @@ void tst_QAbstractItemView::noModel()
 
     QStandardItemModel model(20,20);
     QTreeView view;
+    setFrameless(&view);
 
     view.setModel(&model);
     // Make the viewport smaller than the contents, so that we can scroll
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 2f7b72fefa..f26940aeb1 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -70,6 +70,16 @@ static inline HWND getHWNDForWidget(const QWidget *widget)
 }
 #endif // Q_OS_WIN
 
+// Make a widget frameless to prevent size constraints of title bars
+// from interfering (Windows).
+static inline void setFrameless(QWidget *w)
+{
+    Qt::WindowFlags flags = w->windowFlags();
+    flags |= Qt::FramelessWindowHint;
+    flags &= ~(Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+    w->setWindowFlags(flags);
+}
+
 class tst_QListView : public QObject
 {
     Q_OBJECT
@@ -1178,6 +1188,7 @@ void tst_QListView::selection()
 void tst_QListView::scrollTo()
 {
     QWidget topLevel;
+    setFrameless(&topLevel);
     QListView lv(&topLevel);
     QStringListModel model(&lv);
     QStringList list;
@@ -1842,6 +1853,7 @@ void tst_QListView::taskQTBUG_2233_scrollHiddenItems()
     const int rowCount = 200;
 
     QWidget topLevel;
+    setFrameless(&topLevel);
     QListView view(&topLevel);
     QStringListModel model(&view);
     QStringList list;
@@ -1993,6 +2005,7 @@ void tst_QListView::taskQTBUG_9455_wrongScrollbarRanges()
 
     QStringListModel model(list);
     ListView_9455 w;
+    setFrameless(&w);
     w.setModel(&model);
     w.setViewMode(QListView::IconMode);
     w.resize(116, 132);
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 74511fc87d..51bd09940c 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -57,6 +57,16 @@ typedef QList<int> IntList;
 
 typedef QList<bool> BoolList;
 
+// Make a widget frameless to prevent size constraints of title bars
+// from interfering (Windows).
+static inline void setFrameless(QWidget *w)
+{
+    Qt::WindowFlags flags = w->windowFlags();
+    flags |= Qt::FramelessWindowHint;
+    flags &= ~(Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+    w->setWindowFlags(flags);
+}
+
 class tst_QTableView : public QObject
 {
     Q_OBJECT
@@ -2147,6 +2157,7 @@ void tst_QTableView::rowViewportPosition()
 
     QtTestTableModel model(rowCount, 1);
     QtTestTableView view;
+    setFrameless(&view);
     view.resize(100, 2 * rowHeight);
     view.show();
 
@@ -2309,6 +2320,7 @@ void tst_QTableView::columnViewportPosition()
 
     QtTestTableModel model(1, columnCount);
     QtTestTableView view;
+    setFrameless(&view);
     view.resize(2 * columnWidth, 100);
     view.show();
 
@@ -2586,6 +2598,7 @@ void tst_QTableView::scrollTo()
 
     QtTestTableModel model(rowCount, columnCount);
     QWidget toplevel;
+    setFrameless(&toplevel);
     QtTestTableView view(&toplevel);
 
     toplevel.show();
@@ -3343,6 +3356,7 @@ void tst_QTableView::tabFocus()
     // to change focus on an empty table view, or on a table view that doesn't
     // have this property set.
     QWidget window;
+    window.resize(200, 200);
 
     QTableView *view = new QTableView(&window);
     QLineEdit *edit = new QLineEdit(&window);
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index c4c8c348ff..cb7ca8f5c1 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -111,6 +111,16 @@ struct PublicView : public QTreeView
     QAbstractItemViewPrivate* aiv_priv() { return static_cast<QAbstractItemViewPrivate*>(d_ptr.data()); }
 };
 
+// Make a widget frameless to prevent size constraints of title bars
+// from interfering (Windows).
+static inline void setFrameless(QWidget *w)
+{
+    Qt::WindowFlags flags = w->windowFlags();
+    flags |= Qt::FramelessWindowHint;
+    flags &= ~(Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+    w->setWindowFlags(flags);
+}
+
 class tst_QTreeView : public QObject
 {
     Q_OBJECT
@@ -877,6 +887,7 @@ void tst_QTreeView::horizontalScrollMode()
     }
 
     QTreeView view;
+    setFrameless(&view);
     view.setModel(&model);
     view.setFixedSize(100, 100);
     view.header()->resizeSection(0, 200);
@@ -3417,6 +3428,7 @@ void tst_QTreeView::task224091_appendColumns()
 {
     QStandardItemModel *model = new QStandardItemModel();
     QWidget* topLevel= new QWidget;
+    setFrameless(topLevel);
     QTreeView *treeView = new QTreeView(topLevel);
     treeView->setModel(model);
     topLevel->show();