diff options
| author | juhvu <qt-info@nokia.com> | 2010-07-15 14:42:38 +1000 |
|---|---|---|
| committer | juhvu <qt-info@nokia.com> | 2010-07-15 14:42:38 +1000 |
| commit | 7982a0c688466696c206efbf56bfeb153cf17d78 (patch) | |
| tree | 1ffd0f5ea3dd0cb831a3ac59b81e8fdbfcbc2c3e /bin | |
| parent | 9a6a0b500aa7a024de607e0d6a3c5ebdab6721fe (diff) | |
| parent | f19a7eb43e38dd3bcac18e81f90b4108eeccdce5 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtm-location
Conflicts:
examples/examples.pro
src/s60installs/s60installs.pro
tests/auto/auto.pro
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 a5ce4536b7..becb31c281 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 @@ -84,6 +89,10 @@ cd $shell_path/../build/tests/bin ./tst_qnmeapositioninfosource_simulation_generic ./tst_qdeclarativeposition +#Landmarks +./tst_qlandmark +./tst_qlandmarkcategory + #Publish and Subscribe ./tst_qmallocpool ./tst_qpacket @@ -140,6 +149,8 @@ a ./tst_qversitcontactexporter ./tst_qversitcontactimporter ./tst_qversitdocument +./tst_qversitorganizerexporter +./tst_qversitorganizerimporter ./tst_qversitproperty ./tst_qversitreader ./tst_qversitwriter @@ -149,5 +160,8 @@ a ./tst_qmessagestore ./tst_qmessagestorekeys +#QOrganizer +./tst_qorganizeritemmanager + cd $SAVED_PWD |