diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2010-06-29 17:17:10 +1000 |
|---|---|---|
| committer | Chris Adams <christopher.adams@nokia.com> | 2010-06-29 17:17:10 +1000 |
| commit | 7aa2ecd70165f2a65fe8f3e798f3f371dffedc69 (patch) | |
| tree | f6f99f03f67914d0c91455b61473ab4bc328efc8 /bin | |
| parent | 0e122f7f9167fd7f33e33ff260731f353d75d5d9 (diff) | |
| parent | 16f9e83ca709e079573803adc0b2c7935ff5145f (diff) | |
Merge branch 'mastermerge' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts
Conflicts:
configure.bat
examples/examples.pro
plugins/declarative/declarative.pro
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/rununittests.bat | 5 | ||||
| -rwxr-xr-x | bin/rununittests.sh | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/bin/rununittests.bat b/bin/rununittests.bat index c77d37b8b2..6c8d23a8d3 100644 --- a/bin/rununittests.bat +++ b/bin/rununittests.bat @@ -54,6 +54,11 @@ tst_qservicemanager.exe tst_qservicefilter.exe tst_qserviceinterfacedescriptor.exe tst_qabstractsecuritysession.exe +tst_qservicecontext.exe +tst_qmetaobjectbuilder.exe +tst_icheck.exe +tst_qservicemanager_ipc.exe +tst_qremoteserviceclassregister.exe ::BearerManagement tst_qnetworkconfiguration.exe diff --git a/bin/rununittests.sh b/bin/rununittests.sh index 636be715a3..807f400cf7 100755 --- a/bin/rununittests.sh +++ b/bin/rununittests.sh @@ -63,6 +63,11 @@ cd $shell_path/../build/tests/bin ./tst_qservicefilter ./tst_qservicemanager ./tst_qabstractsecuritysession +./tst_qservicecontext +./tst_icheck +./tst_qmetaobjectbuilder +./tst_qremoteserviceclassregister +./tst_qservicemanager_ipc #BearerManagement ./tst_qnetworkconfiguration |