diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 18:29:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 18:29:51 (GMT) |
| commit | 3b0942cde496d003f832d1e4cb3d40a61ce087eb (patch) | |
| tree | 3eb34d9d8a7f96248c4b23588fb68a65661f2116 /tests | |
| parent | 9af7a61ff462ed1668838be949dac376adfb2c6c (diff) | |
| parent | 068e9ddcce8adbf64e5a75f25754fd56d01f7eff (diff) | |
| download | Qt-3b0942cde496d003f832d1e4cb3d40a61ce087eb.zip Qt-3b0942cde496d003f832d1e4cb3d40a61ce087eb.tar.gz Qt-3b0942cde496d003f832d1e4cb3d40a61ce087eb.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:
Build fix on Solaris for an autotest
Fix compiling issue for FreeType version earlier than 2.1.10
Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().
Use NEON and preloading for 16 bit small / medium sized image blits.
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 |