[qt] add correct patch

Than Ngo than at fedoraproject.org
Mon Sep 27 11:19:43 UTC 2010


commit e5e6464e8366a3c82153adcc9c2f03feb03be60d
Author: Than Ngo <than at redhat.com>
Date:   Mon Sep 27 13:18:39 2010 +0200

    add correct patch

 ...pensource-src-4.7.0-QTBUG-13567-QTreeView.patch |   46 --------------------
 1 files changed, 0 insertions(+), 46 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch b/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
index 2772fcb..d517de5 100644
--- a/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
+++ b/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
@@ -13,10 +13,6 @@ QTBUG-13567).
 
 Merge-request: 2481
 Reviewed-by: Olivier Goffart <olivier.goffart at nokia.com>
----
- src/gui/itemviews/qtreeview.cpp        |    4 ++++
- tests/auto/qtreeview/tst_qtreeview.cpp |   22 ++++++++++++++++++++++
- 2 files changed, 26 insertions(+), 0 deletions(-)
 
 diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
 index b797776..40b51fe 100644
@@ -33,45 +29,3 @@ index b797776..40b51fe 100644
      int itemsInViewport = 0;
      if (uniformRowHeights) {
          if (defaultItemHeight <= 0)
-diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
-index 7e2e800..c7b53e9 100644
---- a/tests/auto/qtreeview/tst_qtreeview.cpp
-+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
-@@ -240,6 +240,7 @@ private slots:
-     void taskQTBUG_6450_selectAllWith1stColumnHidden();
-     void taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint();
-     void taskQTBUG_11466_keyboardNavigationRegression();
-+    void taskQTBUG_13567_removeLastItemRegression();
- };
- 
- class QtTestModel: public QAbstractItemModel
-@@ -3910,5 +3911,26 @@ void tst_QTreeView::taskQTBUG_11466_keyboardNavigationRegression()
-     QTRY_COMPARE(treeView.currentIndex(), treeView.selectionModel()->selection().indexes().first());
- }
- 
-+void tst_QTreeView::taskQTBUG_13567_removeLastItemRegression()
-+{
-+    QtTestModel model(200, 1);
-+
-+    QTreeView view;
-+    view.setSelectionMode(QAbstractItemView::ExtendedSelection);
-+    view.setModel(&model);
-+    view.show();
-+    QTest::qWaitForWindowShown(&view);
-+
-+    view.scrollToBottom();
-+    QTest::qWait(10);
-+    CHECK_VISIBLE(199, 0);
-+
-+    view.setCurrentIndex(model.index(199, 0));
-+    model.removeLastRow();
-+    QTest::qWait(10);
-+    QCOMPARE(view.currentIndex(), model.index(198, 0));
-+    CHECK_VISIBLE(198, 0);
-+}
-+
- QTEST_MAIN(tst_QTreeView)
- #include "tst_qtreeview.moc"
--- 
-1.6.1
-


More information about the scm-commits mailing list