Date: Monday, September 27, 2010 @ 08:21:11 Author: andrea Revision: 91561
upgpkg: qt 4.7.0-2 fix patch Modified: qt/trunk/PKGBUILD qt/trunk/fix-scroll-when-last-item-is-removed.patch --------------------------------------------+ PKGBUILD | 2 - fix-scroll-when-last-item-is-removed.patch | 39 --------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-09-27 12:18:48 UTC (rev 91560) +++ PKGBUILD 2010-09-27 12:21:11 UTC (rev 91561) @@ -24,7 +24,7 @@ 'd457f0a0ad68a3861c3cadefe3b42ded' '668331d9798a0e2b94381efb7be4c513' 'c29f2993d6a0f73d756d2fa36e130e1c' - '072a9b008878e171a86fb90cdf8ce52d') + 'ef20c34afc5be5ed62f2935be66d9402') build() { unset QMAKESPEC Modified: fix-scroll-when-last-item-is-removed.patch =================================================================== --- fix-scroll-when-last-item-is-removed.patch 2010-09-27 12:18:48 UTC (rev 91560) +++ fix-scroll-when-last-item-is-removed.patch 2010-09-27 12:21:11 UTC (rev 91561) @@ -33,45 +33,6 @@ 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