Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1

Qt Continuous Integration System · Qt Continuous Integration System · commit 10ae84446e73 · 2011-01-12T23:08:15.000+10:00
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Backporting TESTARGS feature from 4.7
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
@@ -24,6 +24,7 @@ else:win32: {
     else:check.commands += $(DESTDIR_TARGET)
 }
 embedded:  check.commands += -qws
+check.commands += $(TESTARGS)
 QMAKE_EXTRA_TARGETS += check
 
 !debug_and_release|build_pass {

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ else:win32: {`
`24`	`24`	`else:check.commands += $(DESTDIR_TARGET)`
`25`	`25`	`}`
`26`	`26`	`embedded: check.commands += -qws`
	`27`	`+check.commands += $(TESTARGS)`
`27`	`28`	`QMAKE_EXTRA_TARGETS += check`
`28`	`29`
`29`	`30`	`!debug_and_release\|build_pass {`