diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-29 12:37:15 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-29 12:37:15 (GMT) |
| commit | 86b4c125372f02c21be81fff376817852c28afa9 (patch) | |
| tree | 65988a37ffaa6c75a72395365aa695c052df2149 /mkspecs/features/qttest_p4.prf | |
| parent | 36304a764fb4ee0cc7cc26033c05c8d70c87b4b5 (diff) | |
| parent | 82ad1edea9fd6d6955ab9e3f661c625f7ba5ed78 (diff) | |
| download | Qt-86b4c125372f02c21be81fff376817852c28afa9.zip Qt-86b4c125372f02c21be81fff376817852c28afa9.tar.gz Qt-86b4c125372f02c21be81fff376817852c28afa9.tar.bz2 | |
Merge branch '4.6'
Conflicts:
doc/src/qt4-intro.qdoc
Diffstat (limited to 'mkspecs/features/qttest_p4.prf')
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index 4ab5ac2..525e7b2 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -4,7 +4,7 @@ CONFIG += qt warn_on console depend_includepath qtAddLibrary(QtTest) symbian:{ -# qt.prf sets TARGET.EPOCSTACKSIZE and TARGET.EPOCHEAPSIZE + TARGET.EPOCHEAPSIZE = 0x100000 0x2000000 # DEFINES += QTEST_NO_SPECIALIZATIONS TARGET.CAPABILITY="ALL -TCB" RSS_RULES ="group_name=\"QtTests\";" |