Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

Merge latest changes of master into merge :) Conflicts: doc/qtcreator.qdoc
2010-08-23 16:31:43 +02:00
parent ef1e52dfd1 c82796247c
commit 849b91e574
25 changed files with 258 additions and 88 deletions
@@ -30,6 +30,7 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) {
 }

 symbian {
+    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
    contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -leiksrv -lcone
    contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices
 } else:win32 {