2 files changed, 118 insertions, 1 deletions

diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 9b834d5..b6a402e 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -306,6 +306,7 @@ private slots:
     void inputMethodHints();
     void toolTip();
     void visible();
+    void isVisibleTo();
     void explicitlyVisible();
     void enabled();
     void explicitlyEnabled();
@@ -1138,6 +1139,113 @@ void tst_QGraphicsItem::visible()
     QVERIFY(!item->hasFocus());
 }
 
+void tst_QGraphicsItem::isVisibleTo()
+{
+    QGraphicsScene scene;
+    QGraphicsItem *parent = scene.addRect(QRectF(0, 0, 100, 100));
+    QGraphicsItem *child = scene.addRect(QRectF(25, 25, 50, 50));
+    QGraphicsItem *grandChild = scene.addRect(QRectF(50, 50, 50, 50));
+    QGraphicsItem *stranger = scene.addRect(100, 100, 100, 100);
+
+    child->setParentItem(parent);
+    grandChild->setParentItem(child);
+
+    QVERIFY(grandChild->isVisible());
+    QVERIFY(grandChild->isVisibleTo(grandChild));
+    QVERIFY(grandChild->isVisibleTo(child));
+    QVERIFY(grandChild->isVisibleTo(parent));
+    QVERIFY(grandChild->isVisibleTo(0));
+    QVERIFY(child->isVisible());
+    QVERIFY(child->isVisibleTo(child));
+    QVERIFY(child->isVisibleTo(parent));
+    QVERIFY(child->isVisibleTo(0));
+    QVERIFY(parent->isVisible());
+    QVERIFY(parent->isVisibleTo(parent));
+    QVERIFY(parent->isVisibleTo(0));
+    QVERIFY(!parent->isVisibleTo(child));
+    QVERIFY(!child->isVisibleTo(grandChild));
+    QVERIFY(!grandChild->isVisibleTo(stranger));
+    QVERIFY(!child->isVisibleTo(stranger));
+    QVERIFY(!parent->isVisibleTo(stranger));
+    QVERIFY(!stranger->isVisibleTo(grandChild));
+    QVERIFY(!stranger->isVisibleTo(child));
+    QVERIFY(!stranger->isVisibleTo(parent));
+
+    // Case 1: only parent is explicitly hidden
+    parent->hide();
+
+    QVERIFY(!grandChild->isVisible());
+    QVERIFY(grandChild->isVisibleTo(grandChild));
+    QVERIFY(grandChild->isVisibleTo(child));
+    QVERIFY(grandChild->isVisibleTo(parent));
+    QVERIFY(!grandChild->isVisibleTo(0));
+    QVERIFY(!child->isVisible());
+    QVERIFY(child->isVisibleTo(child));
+    QVERIFY(child->isVisibleTo(parent));
+    QVERIFY(!child->isVisibleTo(0));
+    QVERIFY(!parent->isVisible());
+    QVERIFY(!parent->isVisibleTo(parent));
+    QVERIFY(!parent->isVisibleTo(0));
+    QVERIFY(!parent->isVisibleTo(child));
+    QVERIFY(!child->isVisibleTo(grandChild));
+    QVERIFY(!grandChild->isVisibleTo(stranger));
+    QVERIFY(!child->isVisibleTo(stranger));
+    QVERIFY(!parent->isVisibleTo(stranger));
+    QVERIFY(!stranger->isVisibleTo(grandChild));
+    QVERIFY(!stranger->isVisibleTo(child));
+    QVERIFY(!stranger->isVisibleTo(parent));
+
+    // Case 2: only child is hidden
+    parent->show();
+    child->hide();
+
+    QVERIFY(!grandChild->isVisible());
+    QVERIFY(grandChild->isVisibleTo(grandChild));
+    QVERIFY(grandChild->isVisibleTo(child));
+    QVERIFY(!grandChild->isVisibleTo(parent));
+    QVERIFY(!grandChild->isVisibleTo(0));
+    QVERIFY(!child->isVisible());
+    QVERIFY(!child->isVisibleTo(child));
+    QVERIFY(!child->isVisibleTo(parent));
+    QVERIFY(!child->isVisibleTo(0));
+    QVERIFY(parent->isVisible());
+    QVERIFY(parent->isVisibleTo(parent));
+    QVERIFY(parent->isVisibleTo(0));
+    QVERIFY(!parent->isVisibleTo(child));
+    QVERIFY(!child->isVisibleTo(grandChild));
+    QVERIFY(!grandChild->isVisibleTo(stranger));
+    QVERIFY(!child->isVisibleTo(stranger));
+    QVERIFY(!parent->isVisibleTo(stranger));
+    QVERIFY(!stranger->isVisibleTo(grandChild));
+    QVERIFY(!stranger->isVisibleTo(child));
+    QVERIFY(!stranger->isVisibleTo(parent));
+
+    // Case 3: only grand child is hidden
+    child->show();
+    grandChild->hide();
+
+    QVERIFY(!grandChild->isVisible());
+    QVERIFY(!grandChild->isVisibleTo(grandChild));
+    QVERIFY(!grandChild->isVisibleTo(child));
+    QVERIFY(!grandChild->isVisibleTo(parent));
+    QVERIFY(!grandChild->isVisibleTo(0));
+    QVERIFY(child->isVisible());
+    QVERIFY(child->isVisibleTo(child));
+    QVERIFY(child->isVisibleTo(parent));
+    QVERIFY(child->isVisibleTo(0));
+    QVERIFY(parent->isVisible());
+    QVERIFY(parent->isVisibleTo(parent));
+    QVERIFY(parent->isVisibleTo(0));
+    QVERIFY(!parent->isVisibleTo(child));
+    QVERIFY(!child->isVisibleTo(grandChild));
+    QVERIFY(!grandChild->isVisibleTo(stranger));
+    QVERIFY(!child->isVisibleTo(stranger));
+    QVERIFY(!parent->isVisibleTo(stranger));
+    QVERIFY(!stranger->isVisibleTo(grandChild));
+    QVERIFY(!stranger->isVisibleTo(child));
+    QVERIFY(!stranger->isVisibleTo(parent));
+}
+
 void tst_QGraphicsItem::explicitlyVisible()
 {
     QGraphicsScene scene;
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index facb982..c37a4ea 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -45,6 +45,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui/QtGui>
+#include <private/qabstractitemview_p.h>
 #include "../../shared/util.h"
 
 //TESTED_CLASS=
@@ -112,6 +113,8 @@ struct PublicView : public QTreeView
 
     inline QStyleOptionViewItem viewOptions() const { return QTreeView::viewOptions(); }
     inline int sizeHintForColumn(int column) const { return QTreeView::sizeHintForColumn(column); }
+    inline void startDrag(Qt::DropActions supportedActions) { QTreeView::startDrag(supportedActions); }
+    QAbstractItemViewPrivate* aiv_priv() { return static_cast<QAbstractItemViewPrivate*>(d_ptr.data()); }
 };
 
 class tst_QTreeView : public QObject
@@ -2947,7 +2950,7 @@ void tst_QTreeView::styleOptionViewItem()
             bool allCollapsed;
     };
 
-    QTreeView view;
+    PublicView view;
     QStandardItemModel model;
     view.setModel(&model);
     MyDelegate delegate;
@@ -3006,6 +3009,12 @@ void tst_QTreeView::styleOptionViewItem()
     QApplication::processEvents();
     QTRY_VERIFY(delegate.count >= 4);
 
+    // test that the rendering of drag pixmap sets the correct options too (QTBUG-15834)
+    delegate.count = 0;
+    QItemSelection sel(model.index(0,0), model.index(0,3));
+    QRect rect;
+    view.aiv_priv()->renderToPixmap(sel.indexes(), &rect);
+    QTRY_VERIFY(delegate.count >= 4);
 
     //test dynamic models
     {