3 files changed, 84 insertions, 7 deletions

diff --git a/tests/auto/gestures/tst_gestures.cpp b/tests/auto/gestures/tst_gestures.cpp
index 7c1170c..a968520 100644
--- a/tests/auto/gestures/tst_gestures.cpp
+++ b/tests/auto/gestures/tst_gestures.cpp
@@ -334,6 +334,7 @@ private slots:
     void gestureOverChild();
     void multipleWidgetOnlyGestureInTree();
     void conflictingGestures();
+    void conflictingGesturesInGraphicsView();
     void finishedWithoutStarted();
     void unknownGesture();
     void graphicsItemGesture();
@@ -2235,5 +2236,70 @@ void tst_Gestures::testReuseCanceledGestures()
     QCOMPARE(target->canceled(), 1);
 }
 
+void tst_Gestures::conflictingGesturesInGraphicsView()
+{
+    QGraphicsScene scene;
+    GraphicsView view(&scene);
+    view.setWindowFlags(Qt::X11BypassWindowManagerHint);
+
+    GestureItem *item1 = new GestureItem("item1");
+    item1->grabGesture(CustomGesture::GestureType);
+    item1->size = QRectF(0, 0, 100, 100);
+    item1->setZValue(2);
+    scene.addItem(item1);
+
+    GestureItem *item2 = new GestureItem("item2");
+    item2->grabGesture(CustomGesture::GestureType);
+    item2->size = QRectF(0, 0, 100, 100);
+    item2->setZValue(5);
+    scene.addItem(item2);
+
+    view.show();
+    QTest::qWaitForWindowShown(&view);
+    view.ensureVisible(scene.sceneRect());
+
+    static const int TotalGestureEventsCount = CustomGesture::SerialFinishedThreshold - CustomGesture::SerialStartedThreshold + 1;
+
+    CustomEvent event;
+
+    // nobody accepts override
+    item1->acceptGestureOverride = false;
+    item2->acceptGestureOverride = false;
+    event.hotSpot = mapToGlobal(item2->boundingRect().center(), item2, &view);
+    event.hasHotSpot = true;
+    sendCustomGesture(&event, item2, &scene);
+    QCOMPARE(item2->gestureOverrideEventsReceived, 1);
+    QCOMPARE(item2->gestureEventsReceived, TotalGestureEventsCount);
+    QCOMPARE(item1->gestureOverrideEventsReceived, 1);
+    QCOMPARE(item1->gestureEventsReceived, 0);
+
+    item1->reset(); item2->reset();
+
+    // the original target accepts override
+    item1->acceptGestureOverride = false;
+    item2->acceptGestureOverride = true;
+    event.hotSpot = mapToGlobal(item2->boundingRect().center(), item2, &view);
+    event.hasHotSpot = true;
+    sendCustomGesture(&event, item2, &scene);
+    QCOMPARE(item2->gestureOverrideEventsReceived, 1);
+    QCOMPARE(item2->gestureEventsReceived, TotalGestureEventsCount);
+    QCOMPARE(item1->gestureOverrideEventsReceived, 0);
+    QCOMPARE(item1->gestureEventsReceived, 0);
+
+    item1->reset(); item2->reset();
+
+    // the item behind accepts override
+    item1->acceptGestureOverride = true;
+    item2->acceptGestureOverride = false;
+    event.hotSpot = mapToGlobal(item2->boundingRect().center(), item2, &view);
+    event.hasHotSpot = true;
+    sendCustomGesture(&event, item2, &scene);
+
+    QCOMPARE(item2->gestureOverrideEventsReceived, 1);
+    QCOMPARE(item2->gestureEventsReceived, 0);
+    QCOMPARE(item1->gestureOverrideEventsReceived, 1);
+    QCOMPARE(item1->gestureEventsReceived, TotalGestureEventsCount);
+}
+
 QTEST_MAIN(tst_Gestures)
 #include "tst_gestures.moc"
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp
index 43fbba1..1a38070 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/qapplication/tst_qapplication.cpp
@@ -189,15 +189,22 @@ void tst_QApplication::getSetCheck()
 {
     int argc = 0;
     QApplication obj1(argc, 0, QApplication::GuiServer);
-    // QInputContext * QApplication::inputContext()
-    // void QApplication::setInputContext(QInputContext *)
     MyInputContext *var1 = new MyInputContext;
+
+    // QApplication takes ownership, so check for reparenting:
     obj1.setInputContext(var1);
-    QCOMPARE((QInputContext *)var1, obj1.inputContext());
+    QCOMPARE(var1->parent(), static_cast<QObject *>(&obj1));
+
+    // Test for self-assignment:
+    obj1.setInputContext(obj1.inputContext());
+    QVERIFY(obj1.inputContext());
+    QCOMPARE(static_cast<QInputContext *>(var1), obj1.inputContext());
+
+    // Resetting the input context to 0 is not allowed:
     QTest::ignoreMessage(QtWarningMsg, "QApplication::setInputContext: called with 0 input context");
-    obj1.setInputContext((QInputContext *)0);
-    QCOMPARE((QInputContext *)var1, obj1.inputContext());
-    // delete var1; // No delete, since QApplication takes ownership
+    obj1.setInputContext(0);
+
+    QCOMPARE(static_cast<QInputContext *>(var1), obj1.inputContext());
 }
 
 class CloseEventTestWindow : public QWidget
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 5d47aed..83a9e3a 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -605,10 +605,14 @@ void tst_QWidget::getSetCheck()
     obj1.setAttribute(Qt::WA_InputMethodEnabled);
     obj1.setInputContext(var13);
     QCOMPARE(static_cast<QInputContext *>(var13), obj1.inputContext());
+    // QWidget takes ownership, so check parent
+    QCOMPARE(var13->parent(), static_cast<QObject *>(&obj1));
+    // Check self assignment
+    obj1.setInputContext(obj1.inputContext());
+    QCOMPARE(static_cast<QInputContext *>(var13), obj1.inputContext());
     obj1.setInputContext((QInputContext *)0);
     QCOMPARE(qApp->inputContext(), obj1.inputContext());
     QVERIFY(qApp->inputContext() != var13);
-    //delete var13; // No delete, since QWidget takes ownership
 
     // bool QWidget::autoFillBackground()
     // void QWidget::setAutoFillBackground(bool)