diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-09-03 01:35:33 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-09-03 01:35:33 (GMT) |
| commit | cdf73a54170347eb2c0b4d048da3e9aa87e756c4 (patch) | |
| tree | 918de8002685ce97bf5e150fd6d625feb2ffe686 /tests | |
| parent | 1bd2eb8ecd6b2377132beaa789c8b3b8a6f544d9 (diff) | |
| parent | 4dd241331b9c906fe166184f7111f915ed8c00c0 (diff) | |
| download | Qt-cdf73a54170347eb2c0b4d048da3e9aa87e756c4.zip Qt-cdf73a54170347eb2c0b4d048da3e9aa87e756c4.tar.gz Qt-cdf73a54170347eb2c0b4d048da3e9aa87e756c4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests')
| -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 |