diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-09-02 13:43:17 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-09-02 13:43:17 (GMT) |
| commit | 2bb571fe49d05b06b13aedc4f7fb71cbb1c949be (patch) | |
| tree | ac37be379829c9aa5e9853763cb7f7d1a22464b8 /tests/auto/qgraphicsitem | |
| parent | 0d54ade501443d8a3b0e756520f6c43e602f1283 (diff) | |
| parent | 7aed1cf06ed7b50f060ebce7a5a041c752989307 (diff) | |
| download | Qt-2bb571fe49d05b06b13aedc4f7fb71cbb1c949be.zip Qt-2bb571fe49d05b06b13aedc4f7fb71cbb1c949be.tar.gz Qt-2bb571fe49d05b06b13aedc4f7fb71cbb1c949be.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/qgraphicsitem')
| -rw-r--r-- | tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 3634ce9..4476084 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -4578,7 +4578,7 @@ void tst_QGraphicsItem::itemChange() QCOMPARE(tester.changes.at(tester.changes.size() - 1), QGraphicsItem::ItemFlagsHaveChanged); QVariant expectedFlags = qVariantFromValue<quint32>(QGraphicsItem::GraphicsItemFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges)); QCOMPARE(tester.values.at(tester.values.size() - 2), expectedFlags); - QCOMPARE(tester.values.at(tester.values.size() - 1), qVariantFromValue<quint32>(QGraphicsItem::ItemIsSelectable)); + QCOMPARE(tester.values.at(tester.values.size() - 1), qVariantFromValue<quint32>((quint32)QGraphicsItem::ItemIsSelectable)); } { // ItemSelectedChange |