diff options
| author | Alex <qt-info@nokia.com> | 2009-08-31 14:10:25 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2009-08-31 14:10:25 +1000 |
| commit | ca09f9d8e1ff3d7537e877e5f65c3f92dd9ca8d0 (patch) | |
| tree | dcc1c2816c02cd3308a45ca85ae90a9c877f6eea /bin | |
| parent | a650adf66badffb45a94256b66b69c144a771520 (diff) | |
| parent | db356fd60bf54d9f7f31af03d4a349fc51ac449c (diff) | |
Merge branch 'master' of ../location
Conflicts:
README
bin/rununittests.sh
common.pri
doc/html/index.html
doc/src/index.qdoc
examples/examples.pro
tests/auto/auto.pro
tests/tests.pro
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/purge.sh | 2 | ||||
| -rwxr-xr-x | bin/rununittests.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/bin/purge.sh b/bin/purge.sh index 80790f319f..bc8f92ad9f 100755 --- a/bin/purge.sh +++ b/bin/purge.sh @@ -2,4 +2,4 @@ make clean find . -name "Makefile*" |xargs rm -rm -rf build +rm -rf build include diff --git a/bin/rununittests.sh b/bin/rununittests.sh index 982619789d..14fb7049e1 100755 --- a/bin/rununittests.sh +++ b/bin/rununittests.sh @@ -19,6 +19,14 @@ LD_LIBRARY_PATH=$shell_path/../build/Debug/bin:$LD_LIBRARY_PATH ./tst_qnetworkconfiguration ./tst_qnetworkconfigurationmanager ./tst_qnetworksession +./tst_qgeocoordinate +./tst_qgeopositioninfo +./tst_qsatelliteinfo +./tst_qsatelliteinfosource +./tst_qgeopositioninfosource +./tst_qgeoareamonitor +./tst_qlocationutils +./tst_qnmeapositioninfosource cd $SAVED_PWD |