diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-31 15:02:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 06:59:42 +0100 |
| commit | a1c3bd75470520a5e5ce29bc04fa9ca5e18bffa5 (patch) | |
| tree | ff7ab77397b7570015141735cc9f0e509ac808c9 | |
| parent | a6e6296ce3e27579b9a1e42089b76bc248428f4e (diff) | |
Remove disabled code from qgraphicssceneindex test
The removed code used to test API that was removed in the graphicsview
refactor that was done for Qt 4.5.1.
Change-Id: I3b312b9e51114e24c6ef1191353c35688b229d99
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp index 7507701267..ac26999e16 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp @@ -56,8 +56,6 @@ public slots: void initTestCase(); private slots: - void customIndex_data(); - void customIndex(); void scatteredItems_data(); void scatteredItems(); void overlappedItems_data(); @@ -99,25 +97,6 @@ QGraphicsSceneIndex *tst_QGraphicsSceneIndex::createIndex(const QString &indexMe return index; } -void tst_QGraphicsSceneIndex::customIndex_data() -{ - common_data(); -} - -void tst_QGraphicsSceneIndex::customIndex() -{ -#if 0 - QFETCH(QString, indexMethod); - QGraphicsSceneIndex *index = createIndex(indexMethod); - - QGraphicsScene scene; - scene.setSceneIndex(index); - - scene.addRect(0, 0, 30, 40); - QCOMPARE(scene.items(QRectF(0, 0, 10, 10)).count(), 1); -#endif -} - void tst_QGraphicsSceneIndex::scatteredItems_data() { common_data(); @@ -128,12 +107,7 @@ void tst_QGraphicsSceneIndex::scatteredItems() QFETCH(QString, indexMethod); QGraphicsScene scene; -#if 1 scene.setItemIndexMethod(indexMethod == "linear" ? QGraphicsScene::NoIndex : QGraphicsScene::BspTreeIndex); -#else - QGraphicsSceneIndex *index = createIndex(indexMethod); - scene.setSceneIndex(index); -#endif for (int i = 0; i < 10; ++i) scene.addRect(i*50, i*50, 40, 35); @@ -157,12 +131,7 @@ void tst_QGraphicsSceneIndex::overlappedItems() QFETCH(QString, indexMethod); QGraphicsScene scene; -#if 1 scene.setItemIndexMethod(indexMethod == "linear" ? QGraphicsScene::NoIndex : QGraphicsScene::BspTreeIndex); -#else - QGraphicsSceneIndex *index = createIndex(indexMethod); - scene.setSceneIndex(index); -#endif for (int i = 0; i < 10; ++i) for (int j = 0; j < 10; ++j) @@ -191,12 +160,7 @@ void tst_QGraphicsSceneIndex::movingItems() QFETCH(QString, indexMethod); QGraphicsScene scene; -#if 1 scene.setItemIndexMethod(indexMethod == "linear" ? QGraphicsScene::NoIndex : QGraphicsScene::BspTreeIndex); -#else - QGraphicsSceneIndex *index = createIndex(indexMethod); - scene.setSceneIndex(index); -#endif for (int i = 0; i < 10; ++i) scene.addRect(i*50, i*50, 40, 35); |