diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:21:30 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:21:30 (GMT) |
| commit | ab13e9c099a505a821caaccc6ae252388e676083 (patch) | |
| tree | 503fe8c32d30c0e408defc0d7c54d47eeb2d6cc0 /tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | |
| parent | 4258dd04e25c8831be9e8a7dc45b52d34782cb35 (diff) | |
| parent | 72378ce571bcb88d0519a1b02d0e543b5237d613 (diff) | |
| download | Qt-ab13e9c099a505a821caaccc6ae252388e676083.zip Qt-ab13e9c099a505a821caaccc6ae252388e676083.tar.gz Qt-ab13e9c099a505a821caaccc6ae252388e676083.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 3dd69da..652404c 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -1566,7 +1566,7 @@ void tst_qdeclarativeecmascript::callQtInvokables() o.reset(); { - QString expected = "MyInvokableObject(0x" + QString::number((intptr_t)&o, 16) + ")"; + QString expected = "MyInvokableObject(0x" + QString::number((quintptr)&o, 16) + ")"; QCOMPARE(engine->evaluate("object.method_QString(object)").isUndefined(), true); QCOMPARE(o.error(), false); QCOMPARE(o.invoked(), 11); |