diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-30 17:06:37 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-30 17:06:37 (GMT) |
| commit | 0713442baa4120050e85c13998797415bb40efce (patch) | |
| tree | 2735cae5573363fd5edceae71ae8b7af60518df2 /tests/auto/qcryptographichash/qcryptographichash.pro | |
| parent | 08478207ee9a6563ae63ebcef833925db6426bd8 (diff) | |
| parent | 01648005f1f546dc0281155fecd94b4f47a94584 (diff) | |
| download | Qt-0713442baa4120050e85c13998797415bb40efce.zip Qt-0713442baa4120050e85c13998797415bb40efce.tar.gz Qt-0713442baa4120050e85c13998797415bb40efce.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
Diffstat (limited to 'tests/auto/qcryptographichash/qcryptographichash.pro')
| -rw-r--r-- | tests/auto/qcryptographichash/qcryptographichash.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qcryptographichash/qcryptographichash.pro b/tests/auto/qcryptographichash/qcryptographichash.pro index aa9a7c4..7e1a866 100644 --- a/tests/auto/qcryptographichash/qcryptographichash.pro +++ b/tests/auto/qcryptographichash/qcryptographichash.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qcryptographichash.cpp QT = core -symbian*: { +symbian: { TARGET.EPOCSTACKSIZE =0x5000 -TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" +TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb } |