--- a/qtmobility/configure.bat Tue Apr 27 17:29:55 2010 +0300
+++ b/qtmobility/configure.bat Tue May 11 16:58:44 2010 +0300
@@ -56,6 +56,7 @@
set BUILD_UNITTESTS=no
set BUILD_EXAMPLES=no
set BUILD_DOCS=yes
+set BUILD_TOOLS=yes
set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors
set MOBILITY_MODULES_UNPARSED=
set VC_TEMPLATE_OPTION=
@@ -84,6 +85,7 @@
if "%1" == "-qt" goto qtTag
if "%1" == "-vc" goto vcTag
if "%1" == "-no-docs" goto nodocsTag
+if "%1" == "-no-tools" goto noToolsTag
if "%1" == "-modules" goto modulesTag
if "%1" == "/?" goto usage
if "%1" == "-h" goto usage
@@ -211,6 +213,11 @@
shift
goto cmdline_parsing
+:noToolsTag
+set BUILD_TOOLS=no
+shift
+goto cmdline_parsing
+
:modulesTag
shift
:: %1 can have leading/trailing quotes, so we can't use if "%1" == ""
@@ -316,6 +323,9 @@
echo build_docs = %BUILD_DOCS% >> %PROJECT_CONFIG%
set BUILD_DOCS=
+echo build_tools = %BUILD_TOOLS% >> %PROJECT_CONFIG%
+set BUILD_TOOLS=
+
echo qmf_enabled = no >> %PROJECT_CONFIG%
echo isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
@@ -451,6 +461,8 @@
call :compileTest SNAP snap
call :compileTest OCC occ
call :compileTest SymbianContactSIM symbiancntsim
+call :compileTest S60_Sensor_API sensors_s60_31
+call :compileTest Symbian_Sensor_Framework sensors_symbian
echo End of compile tests
echo.
echo.
@@ -485,7 +497,6 @@
perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\messaging
) else if %FIRST% == multimedia (
perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia
- perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia\experimental
) else if %FIRST% == publishsubscribe (
perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\publishsubscribe
) else if %FIRST% == systeminfo (