Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (165 commits)
  Add 'We mean it.' header.
  Use provided typedef for QNetworkConfigurationPrivatePointer.
  Fix public includes.
  Document networkSessionOnline() signal and mark as internal.
  Tag new classes as since 4.7.
  Fix documentation.
  Remove debug.
  Update copyright year to 2010.
  We don't need to migrate cached replies.
  Fix after reworking to use signals/slots.
  Remove debug.
  Rename and remove unused private slots.
  Add comments to private state enums.
  Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."
  Move check for range header support to before deleting backend.
  Don't try to migrate finished or aborted requests.
  Clarify TemporaryNetworkFailureError docs.
  Remove functions used for testing.
  Connect signals between QNAM and QNetworkReplyImpl.
  Fix networkAccessEnabled implementation.
  ...

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/benchmarks/script/qscriptengine/qscriptengine.pro b/tests/benchmarks/script/qscriptengine/qscriptengine.pro
new file mode 100644
index 0000000..df6dbb3
--- /dev/null
+++ b/tests/benchmarks/script/qscriptengine/qscriptengine.pro
@@ -0,0 +1,12 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_qscriptengine
+
+SOURCES += tst_qscriptengine.cpp
+
+QT += script
+
+symbian* {
+    TARGET.EPOCHEAPSIZE  = 0x20000 0x2000000 // Min 128kB, Max 32MB
+    TARGET.EPOCSTACKSIZE = 0x14000
+}