diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 08:20:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 08:20:14 (GMT) |
| commit | ed08d67fea713e550da0fd0542672cc4443806e2 (patch) | |
| tree | edc0f9be564baf2d503ada0e3e86145526744c38 | |
| parent | 85e625accb7f55b51e19016313bb204f6f0f835c (diff) | |
| parent | 7a4f05f89927fd9ca8771550f1405d99e3961c24 (diff) | |
| download | Qt-ed08d67fea713e550da0fd0542672cc4443806e2.zip Qt-ed08d67fea713e550da0fd0542672cc4443806e2.tar.gz Qt-ed08d67fea713e550da0fd0542672cc4443806e2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Display the itemSendScenePositionChange properly when debugging.
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index b712016..3c255ef 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -11141,7 +11141,7 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlags flags) { debug << '('; bool f = false; - for (int i = 0; i < 16; ++i) { + for (int i = 0; i < 17; ++i) { if (flags & (1 << i)) { if (f) debug << '|'; diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 4d9f23f..c0ad8bf 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -9767,6 +9767,9 @@ void tst_QGraphicsItem::scenePosChange() child1->setFlag(QGraphicsItem::ItemSendsScenePositionChanges, true); grandChild2->setFlag(QGraphicsItem::ItemSendsScenePositionChanges, true); + QVERIFY(child1->flags() & QGraphicsItem::ItemSendsScenePositionChanges); + QVERIFY(grandChild2->flags() & QGraphicsItem::ItemSendsScenePositionChanges); + QGraphicsScene scene; scene.addItem(root); |