diff options
| author | David Laing <david.laing@nokia.com> | 2010-07-05 13:20:17 +1000 |
|---|---|---|
| committer | David Laing <david.laing@nokia.com> | 2010-07-05 13:20:17 +1000 |
| commit | 0d38ab954335556df39456af585a566ed8e022c8 (patch) | |
| tree | 9e82694b5553218d86d88e2f9d4b3604b20f7daa /bin | |
| parent | 719c7ad0e9a9a64f48f137098356c8712580754f (diff) | |
Revert "Revert "Merge branch 'master' of ../../mainline/qtmobility""
This reverts commit e38ebf00c0b539a7756b21946693e201269b976a.
Conflicts:
examples/telephony/dialer/dialer.pro
src/s60installs/bwins/QtMultimediaKitu.def
src/s60installs/bwins/QtServiceFrameworku.def
src/s60installs/bwins/QtSystemInfou.def
src/s60installs/eabi/QtSystemInfou.def
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/rununittests.bat | 9 | ||||
| -rwxr-xr-x | bin/rununittests.sh | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/bin/rununittests.bat b/bin/rununittests.bat index c77d37b8b2..0324cc14e8 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 @@ -74,6 +79,10 @@ tst_qnmeapositioninfosource_realtime_generic.exe tst_qnmeapositioninfosource_simulation.exe tst_qnmeapositioninfosource_simulation_generic.exe +::Landmarks +tst_qlandmark.exe +tst_qlandmarkcategory.exe + ::Publish and Subscribe tst_qvaluespace.exe tst_qvaluespaceprovider.exe diff --git a/bin/rununittests.sh b/bin/rununittests.sh index 5b2c20f561..0dd42d80b8 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 @@ -83,6 +88,10 @@ cd $shell_path/../build/tests/bin ./tst_qnmeapositioninfosource_simulation ./tst_qnmeapositioninfosource_simulation_generic +#Landmarks +./tst_qlandmark +./tst_qlandmarkcategory + #Publish and Subscribe ./tst_qmallocpool ./tst_qpacket @@ -139,6 +148,8 @@ a ./tst_qversitcontactexporter ./tst_qversitcontactimporter ./tst_qversitdocument +./tst_qversitorganizerexporter +./tst_qversitorganizerimporter ./tst_qversitproperty ./tst_qversitreader ./tst_qversitwriter @@ -148,5 +159,8 @@ a ./tst_qmessagestore ./tst_qmessagestorekeys +#QOrganizer +./tst_qorganizeritemmanager + cd $SAVED_PWD |