diff options
| author | Alex <qt-info@nokia.com> | 2009-09-11 10:04:32 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2009-09-11 10:04:32 +1000 |
| commit | 409a78d90579e4cc3c17f97e06d0dfac51c1fe3c (patch) | |
| tree | 8181fdf45d88dc8bc584ae0c8ac2da934e5eddf9 /bin | |
| parent | 281718649305f8d3bf031d7bdd254287bcf6279c (diff) | |
| parent | 884203a9d1a6aad0ea1b6035af884aab4e174ce2 (diff) | |
Merge branch 'master' of ../systeminfo into qtmobility master
(mostly done to fix build breakage for Mac)
Conflicts:
doc/html/systeminformation-library.index
systeminfo/systeminfo.pro
tests/auto/auto.pro
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/rununittests.bat | 1 | ||||
| -rwxr-xr-x | bin/rununittests.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/bin/rununittests.bat b/bin/rununittests.bat index 8dc155e072..dcf7d36c8c 100644 --- a/bin/rununittests.bat +++ b/bin/rununittests.bat @@ -45,6 +45,7 @@ tst_qsystemdisplayinfo.exe tst_qsysteminfo.exe tst_qsystemmemoryinfo.exe tst_qsystemnetworkinfo.exe +tst_qsystemscreensaver.exe cd %SAVED_PWD% diff --git a/bin/rununittests.sh b/bin/rununittests.sh index 61cf217d9c..75dac6dac3 100755 --- a/bin/rununittests.sh +++ b/bin/rununittests.sh @@ -56,6 +56,7 @@ LD_LIBRARY_PATH=$shell_path/../lib:$LD_LIBRARY_PATH ./tst_qsysteminfo ./tst_qsystemmemoryinfo ./tst_qsystemnetworkinfo +./tst_qsystemscreensaver cd $SAVED_PWD |