Merge branch 'fleury-ooo-sequential' into 4.6

2 files changed, 69 insertions, 19 deletions

diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index aa67ac5..6e78522 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -89,6 +89,7 @@ private slots:
     void snakeParallelWithLayout();
     void parallelToHalfLayout();
     void globalSpacing();
+    void graphicsAnchorHandling();
 };
 
 class RectWidget : public QGraphicsWidget
@@ -1196,7 +1197,7 @@ void tst_QGraphicsAnchorLayout::styleDefaults()
     QSizeF pref(20, 20);
     QSizeF max (50, 50);
 
-    /* 
+    /*
     create this layout, where a,b have controlType QSizePolicy::RadioButton
     c,d have controlType QSizePolicy::PushButton:
     +-------+
@@ -1243,9 +1244,9 @@ void tst_QGraphicsAnchorLayout::styleDefaults()
     scene.addItem(window);
 
     window->show();
-    QGraphicsView *view = new QGraphicsView(&scene);
-    view->resize(200, 200);
-    view->show();
+    QGraphicsView view(&scene);
+    view.resize(200, 200);
+    view.show();
 
     window->adjustSize();
     QCOMPARE(a->geometry(), QRectF(0,   3, 20, 20));    //radio
@@ -1264,10 +1265,13 @@ void tst_QGraphicsAnchorLayout::styleDefaults()
     window->setStyle(style);
     window->adjustSize();
     QCOMPARE(a->geometry(), QRectF(0,   3, 20, 20));
-    QCOMPARE(b->geometry(), QRectF(21, 25, 20, 20));     
+    QCOMPARE(b->geometry(), QRectF(21, 25, 20, 20));
     QCOMPARE(c->geometry(), QRectF(42, 47, 20, 20));
     QCOMPARE(d->geometry(), QRectF(63, 69, 20, 20));
     QCOMPARE(l->geometry(), QRectF(0,   0, 89, 98));
+
+    window->setStyle(0);
+    delete style;
 }
 
 
@@ -1776,7 +1780,8 @@ void tst_QGraphicsAnchorLayout::simplificationVsOrder()
     QGraphicsWidget *b = createItem(min, pref, max, "B");
     QGraphicsWidget *c = createItem(min, pref, max, "C");
 
-    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    QGraphicsWidget frame;
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout(&frame);
 
     // Bulk anchors
     l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
@@ -1801,7 +1806,6 @@ void tst_QGraphicsAnchorLayout::simplificationVsOrder()
 
     l->effectiveSizeHint(Qt::MinimumSize);
     if (hasSimplification) {
-        QEXPECT_FAIL("", "Sequential anchors cannot handle children of opposite directions", Continue);
         QCOMPARE(usedSimplex(l, Qt::Horizontal), false);
         QCOMPARE(usedSimplex(l, Qt::Vertical), false);
     }
@@ -1846,7 +1850,8 @@ void tst_QGraphicsAnchorLayout::simplificationVsRedundance()
     QGraphicsWidget *b = createItem(min, pref, max, "B");
     QGraphicsWidget *c = createItem(min, pref, max, "C");
 
-    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    QGraphicsWidget frame;
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout(&frame);
 
     l->addCornerAnchors(a, Qt::TopLeftCorner, l, Qt::TopLeftCorner);
     l->addCornerAnchors(a, Qt::BottomLeftCorner, l, Qt::BottomLeftCorner);
@@ -2016,6 +2021,42 @@ void tst_QGraphicsAnchorLayout::globalSpacing()
     QCOMPARE(newHSpacing, hSpacing);
 }
 
+void tst_QGraphicsAnchorLayout::graphicsAnchorHandling()
+{
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout();
+    QGraphicsWidget *a = createItem();
+
+    l->addAnchors(l, a);
+
+    QGraphicsAnchor *layoutAnchor = l->anchor(l, Qt::AnchorTop, l, Qt::AnchorBottom);
+    QGraphicsAnchor *itemAnchor = l->anchor(a, Qt::AnchorTop, a, Qt::AnchorBottom);
+    QGraphicsAnchor *invalidAnchor = l->anchor(a, Qt::AnchorTop, l, Qt::AnchorBottom);
+
+    // Ensure none of these anchors are accessible.
+    QVERIFY(layoutAnchor == 0);
+    QVERIFY(itemAnchor == 0);
+    QVERIFY(invalidAnchor == 0);
+
+    // Hook the anchors to a QObject
+    QObject object;
+    QGraphicsAnchor *userAnchor = l->anchor(l, Qt::AnchorTop, a, Qt::AnchorTop);
+    userAnchor->setParent(&object);
+    userAnchor = l->anchor(l, Qt::AnchorBottom, a, Qt::AnchorBottom);
+    userAnchor->setParent(&object);
+    userAnchor = l->anchor(l, Qt::AnchorRight, a, Qt::AnchorRight);
+    userAnchor->setParent(&object);
+    userAnchor = l->anchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
+    userAnchor->setParent(&object);
+
+    QCOMPARE(object.children().size(), 4);
+
+    // Delete layout, this will cause all anchors to be deleted internally.
+    // We expect the public QGraphicsAnchor instances to be deleted too.
+    delete l;
+    QCOMPARE(object.children().size(), 0);
+
+    delete a;
+}
 
 QTEST_MAIN(tst_QGraphicsAnchorLayout)
 #include "tst_qgraphicsanchorlayout.moc"
diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index baa1ba1..57dc90d 100644
--- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -356,6 +356,8 @@ void tst_QGraphicsAnchorLayout1::testItemAt()
 
     QVERIFY( layout->itemAt(0) == widget2 );
 
+    delete widget1;
+
     widget->setLayout(layout);
     delete widget;
 }
@@ -460,6 +462,12 @@ void tst_QGraphicsAnchorLayout1::testAddAndRemoveAnchor()
 
     QCOMPARE( layout->count(), 0 );
 
+    delete widget1;
+    delete widget2;
+    delete widget3;
+    delete widget4;
+    delete widget5;
+
     widget->setLayout(layout);
     delete widget;
 }
@@ -1740,9 +1748,9 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout()
         QRectF actual = truncate(widgets[item.index]->geometry());
 
         QCOMPARE(actual, expected);
-        delete widgets[item.index];
     }
 
+    qDeleteAll(widgets);
     delete widget;
 }
 
@@ -2231,8 +2239,9 @@ void tst_QGraphicsAnchorLayout1::testRemoveCenterAnchor()
         const BasicLayoutTestResult item = result[i];
 
         QCOMPARE(widgets[item.index]->geometry(), item.rect);
-        delete widgets[item.index];
     }
+
+    qDeleteAll(widgets);
     delete widget;
 }
 
@@ -2360,7 +2369,7 @@ void tst_QGraphicsAnchorLayout1::testSingleSizePolicy()
     QFETCH(bool, valid);
 
     // create objects
-    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget widget;
     TheAnchorLayout *layout = new TheAnchorLayout;
     TestWidget *childWidget = new TestWidget;
 
@@ -2370,11 +2379,11 @@ void tst_QGraphicsAnchorLayout1::testSingleSizePolicy()
     layout->setAnchor( layout, Qt::AnchorTop, childWidget, Qt::AnchorTop, 10 );
     layout->setAnchor( childWidget, Qt::AnchorBottom, layout, Qt::AnchorBottom, 10 );
 
-    widget->setLayout( layout );
+    widget.setLayout( layout );
 
     // set test case specific: policy and size
     childWidget->setSizePolicy( policy );
-    widget->setGeometry( QRectF( QPoint(0,0), size ) );
+    widget.setGeometry( QRectF( QPoint(0,0), size ) );
 
     QCOMPARE( layout->isValid() , valid );
 
@@ -2516,7 +2525,7 @@ void tst_QGraphicsAnchorLayout1::testDoubleSizePolicy()
     QFETCH(qreal, width2);
 
     // create objects
-    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget widget;
     TheAnchorLayout *layout = new TheAnchorLayout;
     TestWidget *childWidget1 = new TestWidget;
     TestWidget *childWidget2 = new TestWidget;
@@ -2526,13 +2535,13 @@ void tst_QGraphicsAnchorLayout1::testDoubleSizePolicy()
     layout->setAnchor( childWidget1, Qt::AnchorRight, childWidget2, Qt::AnchorLeft, 10 );
     layout->setAnchor( childWidget2, Qt::AnchorRight, layout, Qt::AnchorRight, 10 );
 
-    widget->setLayout( layout );
+    widget.setLayout( layout );
 
     // set test case specific: policy
     childWidget1->setSizePolicy( policy1 );
     childWidget2->setSizePolicy( policy2 );
 
-    widget->setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
+    widget.setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
 
     // check results:
     if ( width1 == -1.0f ) {
@@ -2649,7 +2658,7 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution()
     QFETCH(qreal, width2);
 
     // create objects
-    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget widget;
     TheAnchorLayout *layout = new TheAnchorLayout;
     TestWidget *childWidget1 = new TestWidget;
     TestWidget *childWidget2 = new TestWidget;
@@ -2659,7 +2668,7 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution()
     layout->setAnchor( childWidget1, Qt::AnchorRight, childWidget2, Qt::AnchorLeft, 10 );
     layout->setAnchor( childWidget2, Qt::AnchorRight, layout, Qt::AnchorRight, 10 );
 
-    widget->setLayout( layout );
+    widget.setLayout( layout );
 
     // set test case specific: size hints
     childWidget1->setMinimumWidth( sizeHints1.value( Qt::MinimumSize ) );
@@ -2670,7 +2679,7 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution()
     childWidget2->setPreferredWidth( sizeHints2.value( Qt::PreferredSize ) );
     childWidget2->setMaximumWidth( sizeHints2.value( Qt::MaximumSize ) );
 
-    widget->setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
+    widget.setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
 
     // check results:
     if ( width1 == -1.0f ) {