Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Add a raw bind() function to QGLBuffer.
  QTreeView: Remove a lot of useless and slow code.
  Make sure XCopyArea has completed before resuming rendering
  Make QX11GLPixmapData::scroll() return a value
  Fix some rendering/scrolling artifacts with QX11GLWindowSurface
  Implement scrolling in QX11GLWindowSurface
  Make WA_TranslucentBackground work with QX11GLWindowSurface
  Add ultra-paranoid synchronization to QX11GLPixmapData
  Fixed a potential crash in headerview when inserting a section
  Fix a sizing issue of message box on windows Vista/7

2 files changed, 15 insertions, 1 deletions

diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp
index 4642830..f6cd4e3 100644
--- a/tests/auto/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/qheaderview/tst_qheaderview.cpp
@@ -192,6 +192,7 @@ private slots:
     void task248050_hideRow();
     void QTBUG6058_reset();
     void QTBUG7833_sectionClicked();
+    void QTBUG8650_crashOnInsertSections();
 
 protected:
     QHeaderView *view;
@@ -2056,6 +2057,19 @@ void tst_QHeaderView::QTBUG7833_sectionClicked()
     QCOMPARE(pressedSpy.at(2).at(0).toInt(), 0);
 }
 
+void tst_QHeaderView::QTBUG8650_crashOnInsertSections()
+{
+    QStringList headerLabels;
+    QHeaderView view(Qt::Horizontal);
+    QStandardItemModel model(2,2);
+    view.setModel(&model);
+    view.moveSection(1, 0);
+    view.hideSection(0);
+
+    QList<QStandardItem *> items;
+    items << new QStandardItem("c");
+    model.insertColumn(0, items);
+}
 
 QTEST_MAIN(tst_QHeaderView)
 #include "tst_qheaderview.moc"
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index e39cf6c..bdc0a0c 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -246,7 +246,7 @@ public:
        fetched(false), rows(0), cols(0), levels(INT_MAX), wrongIndex(false) { init(); }
 
     QtTestModel(int _rows, int _cols, QObject *parent = 0): QAbstractItemModel(parent),
-       rows(_rows), cols(_cols), levels(INT_MAX), wrongIndex(false) { init(); }
+       fetched(false), rows(_rows), cols(_cols), levels(INT_MAX), wrongIndex(false) { init(); }
 
     void init() {
         decorationsEnabled = false;