diff options
| author | abcd <qt-info@nokia.com> | 2010-04-27 12:10:24 +1000 |
|---|---|---|
| committer | abcd <qt-info@nokia.com> | 2010-04-27 12:10:24 +1000 |
| commit | 8172310bb2b7403b6b8c06deb37465e261bf2cdf (patch) | |
| tree | 796673b6faa2624b6100363332debafe1f2808b4 /bin | |
| parent | 854b2644c4fd72fbe7be96a4d9455f0d1f28459f (diff) | |
| parent | 602b1006e154e9145f0d7b1d4e7373adfe740b34 (diff) | |
Merge branch 'master' into 1.1-plugins
Conflicts:
doc/html/annotated.html
doc/html/classes.html
doc/html/fetchgooglemaps-mapwindow-h.html
doc/html/functions.html
doc/html/hierarchy.html
doc/html/lightmaps-lightmaps-cpp.html
doc/html/location-overview.html
doc/html/qcontactaddress-members.html
doc/html/qml-audio.html
doc/html/qsystemnetworkinfo.html
doc/html/qt-mobility-project-library.dcf
doc/html/qt-mobility-project-library.index
doc/html/qtmobility.qhp
doc/src/snippets/snippets.pro
features/mobility.prf.template
src/location/liblocationwrapper.cpp
src/location/liblocationwrapper.h
src/location/location.pro
src/location/qgeoareamonitor_maemo.cpp
src/location/qgeoareamonitor_maemo_p.h
src/location/qgeopositioninfosource_maemo5.cpp
src/location/qgeosatelliteinfosource_maemo5.cpp
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/rununittests.bat | 1 | ||||
| -rwxr-xr-x | bin/rununittests.sh | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/bin/rununittests.bat b/bin/rununittests.bat index 6b33fce66a..932b3cc733 100644 --- a/bin/rununittests.bat +++ b/bin/rununittests.bat @@ -97,7 +97,6 @@ tst_qsystemstorageinfo.exe ::QMedia tst_qaudiocapturesource.exe -tst_qcamera.exe tst_qgraphicsvideoitem.exe tst_qmediacontent.exe tst_qmediaimageviewer.exe diff --git a/bin/rununittests.sh b/bin/rununittests.sh index f0d9a210d2..5e02318b51 100755 --- a/bin/rununittests.sh +++ b/bin/rununittests.sh @@ -92,7 +92,7 @@ cd $shell_path/../build/tests/bin ./tst_qpacket ./tst_qpacketprotocol ./tst_qvaluespace -./tst_qvaluespaceprovider +./tst_qvaluespacepublisher ./tst_qvaluespacesubscriber ./tst_qvaluespacesubscriber_oop ./tst_qsystemreadwritelock @@ -109,7 +109,6 @@ cd $shell_path/../build/tests/bin #QMedia ./tst_qaudiocapturesource -./tst_qcamera ./tst_qgraphicsvideoitem ./tst_qmediacontent ./tst_qmediaimageviewer @@ -147,7 +146,6 @@ a ./tst_qversitproperty ./tst_qversitreader ./tst_qversitwriter -./tst_versitutils #QMessaging ./tst_qmessage |