diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-22 13:22:45 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-22 13:22:45 (GMT) |
| commit | 1ac96b5dbc89f5eaf6336d90e5d5c39d5c8113b5 (patch) | |
| tree | ae10cfad099fba8c0fcbbc27813cea8f8398add8 /tests | |
| parent | e1a17008c6be12cb0abe6ec19b544110dce8cbdf (diff) | |
| download | Qt-1ac96b5dbc89f5eaf6336d90e5d5c39d5c8113b5.zip Qt-1ac96b5dbc89f5eaf6336d90e5d5c39d5c8113b5.tar.gz Qt-1ac96b5dbc89f5eaf6336d90e5d5c39d5c8113b5.tar.bz2 | |
Added explicit casts to make QScriptValue autotest compile with NokiaX86
NokiaX86 compiler has problems with implicit casts and templates,
so worked around this problem with explicit casts.
Reviewed-by: Janne Koskinen
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 243b810..3b9da4d 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -2253,7 +2253,7 @@ void tst_QScriptValue::getSetScriptClass() QVERIFY(obj.isVariant()); QCOMPARE(obj.scriptClass(), (QScriptClass*)0); obj.setScriptClass(&testClass); - QCOMPARE(obj.scriptClass(), &testClass); + QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass); QVERIFY(obj.isObject()); QVERIFY(!obj.isVariant()); QVERIFY(!obj.toVariant().isValid()); @@ -2263,7 +2263,7 @@ void tst_QScriptValue::getSetScriptClass() QVERIFY(obj.isQObject()); QCOMPARE(obj.scriptClass(), (QScriptClass*)0); obj.setScriptClass(&testClass); - QCOMPARE(obj.scriptClass(), &testClass); + QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass); QVERIFY(obj.isObject()); QVERIFY(!obj.isQObject()); QVERIFY(obj.toQObject() == 0); |