Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Dec 2011 13:33:44 +0000 (23:33 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Dec 2011 13:33:44 +0000 (23:33 +1000)
commit740435592317e1f242ccacf40b8e66a04069013a
tree637ea1555f4acc004422e2796f6f8155fdbfe67b
parentbe9b7f24a3d5d7e85188390e02fa908d2839c704
parentc9e41cd9db6ed9b5f8e2b0d168288987fbb79e6e
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Symbian: Fix exporting and importing of some functions for autotests
  Symbian: Fix SRCDIR usage in qlayout autotest.
  Symbian: Fix qcssparser autotest
  Symbian: Fix qscriptextensionplugin autotest