summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptqobject
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qscriptqobject')
-rw-r--r--tests/auto/qscriptqobject/qscriptqobject.pro4
-rw-r--r--tests/auto/qscriptqobject/tst_qscriptqobject.cpp6
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/qscriptqobject/qscriptqobject.pro b/tests/auto/qscriptqobject/qscriptqobject.pro
index be3a980..d28fbef 100644
--- a/tests/auto/qscriptqobject/qscriptqobject.pro
+++ b/tests/auto/qscriptqobject/qscriptqobject.pro
@@ -2,4 +2,6 @@ load(qttest_p4)
QT = core gui script
SOURCES += tst_qscriptqobject.cpp
-
+symbian: {
+ TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
+}
diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
index ee914ab..5621696 100644
--- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
+++ b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
@@ -54,6 +54,10 @@
struct CustomType
{
+#if defined (Q_CC_NOKIAX86)
+ // Compiler crash workaround
+ CustomType() {}
+#endif
QString string;
};
Q_DECLARE_METATYPE(CustomType)
@@ -2261,7 +2265,7 @@ void tst_QScriptExtQObject::findChild()
QCOMPARE(result.isNull(), true);
}
- {
+ {
QScriptValue result = m_engine->evaluate("myObject.findChild('myChildObject')");
QCOMPARE(result.isQObject(), true);
QCOMPARE(result.toQObject(), child);