diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-19 13:48:27 +1000 |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-19 13:48:27 +1000 |
commit | db4687b2590e0990f452c790238d523a74faca6b (patch) | |
tree | ab46f4e9bb7b8ab98eab55dee831a2f7aa82c9e0 /bin | |
parent | 09dce6e5c02bfaecc0355b65f259df8a734bc633 (diff) | |
parent | f96e61714dae63e61c4c49766ae957e26a1cd852 (diff) |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility
Conflicts:
src/s60installs/bwins/QtMediau.def
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/rununittests.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/rununittests.sh b/bin/rununittests.sh index 13b6916793..9ee1abe6d7 100755 --- a/bin/rununittests.sh +++ b/bin/rununittests.sh @@ -88,7 +88,7 @@ cd $shell_path/../build/tests/bin ./tst_qpacket ./tst_qpacketprotocol ./tst_qvaluespace -./tst_qvaluespaceprovider +./tst_qvaluespacepublisher ./tst_qvaluespacesubscriber ./tst_qvaluespacesubscriber_oop ./tst_qsystemreadwritelock |