Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 15:39:39 +0000 (01:39 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 15:39:39 +0000 (01:39 +1000)
commit21b357d4e11eee2374d08a70706ced2f964fc5c6
tree1e7e70937e198e954557f3f063c5a8217111f279
parent10ae84446e736941700c39a67d8b4d64a74de89e
parent338bfec36122260cb0c1613de3b15c1703fb7d46
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fixed unescaped backslashes in testcase.prf
  Fix `make check' for debug-and-release on Windows.
  Move `check' target for autotests into testcase.prf
  Revert "Backporting TESTARGS feature from 4.7"