From 6909b28fbae1ebe5f70f4d21353bc5e7af9187ae Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@nokia.com>
Date: Mon, 26 Apr 2010 14:26:18 +0200
Subject: Revert "Fixes selection being cleared when right clicking on a
 selected item."

This reverts commit 27668f4df1756225cfa07fe4195024b501d66d25.
---
 src/gui/graphicsview/qgraphicsitem.cpp         |  2 +-
 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 38 --------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 6db583a..d1c5fd2 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7015,7 +7015,7 @@ void QGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
                 setSelected(true);
             }
         }
-    } else if (!(flags() & ItemIsMovable) && !isSelected()) {
+    } else if (!(flags() & ItemIsMovable)) {
         event->ignore();
     }
     if (d_ptr->isWidget) {
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 6e7c83c..03ce45a 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -294,7 +294,6 @@ private slots:
     void explicitlyEnabled();
     void selected();
     void selected2();
-    void selected3();
     void selected_group();
     void selected_textItem();
     void selected_multi();
@@ -1454,43 +1453,6 @@ void tst_QGraphicsItem::selected2()
     }
 }
 
-void tst_QGraphicsItem::selected3()
-{
-    QGraphicsScene scene;
-    QGraphicsItem *item1 = scene.addRect(QRectF(0, 0, 100, 100));
-    item1->setFlag(QGraphicsItem::ItemIsSelectable);
-
-    QGraphicsItem *item2 = scene.addRect(QRectF(100, 100, 100, 100));
-    item2->setFlag(QGraphicsItem::ItemIsSelectable);
-
-    item1->setSelected(true);
-    QGraphicsView view(&scene);
-    view.show();
-    QTest::qWaitForWindowShown(&view);
-
-    QVERIFY(item1->isSelected());
-    QVERIFY(!item2->isSelected());
-
-    // Right click on a selected item should not clear the selection
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, view.mapFromScene(item1->boundingRect().center()));
-    QVERIFY(item1->isSelected());
-    QCOMPARE(scene.selectedItems().count(), 1);
-
-    // Right click on an unselected item should clear the selection
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, view.mapFromScene(item2->boundingRect().center()));
-    QVERIFY(!item1->isSelected());
-    QCOMPARE(scene.selectedItems().count(), 0);
-
-    item2->setSelected(true);
-    QVERIFY(item2->isSelected());
-    QCOMPARE(scene.selectedItems().count(), 1);
-
-    // Right click on the scene background should clear the selection
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, view.mapFromScene(QPointF(0, 110)));
-    QVERIFY(!item2->isSelected());
-    QCOMPARE(scene.selectedItems().count(), 0);
-}
-
 void tst_QGraphicsItem::selected_group()
 {
     QGraphicsScene scene;
-- 
cgit v0.12