diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-01-06 17:24:03 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-01-06 17:24:03 +1000 |
| commit | 09521fdcd36158f9ef16947b30746e484839cd03 (patch) | |
| tree | 3978abb1ac23868d009eadc50382fba67371bc88 /configure.bat | |
| parent | 12aa5e0201feeb1b42690a971435e7db02f784fe (diff) | |
| parent | db53cfd54e0fe3d0bc6779394f0fd1557a3b7899 (diff) | |
Merge remote branch 'origin/1.1' into master-from-1.1
Conflicts:
doc/src/multimedia.qdoc
doc/src/sf.qdoc
doc/src/si.qdoc
src/systeminfo/qsysteminfo_linux_common.cpp
src/systeminfo/qsysteminfo_s60_p.h
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.bat b/configure.bat index 51d9a7eff2..8e03e0206f 100644 --- a/configure.bat +++ b/configure.bat @@ -572,6 +572,7 @@ call :compileTest Symbian_CamAutoFocus_31 symbian_camera_camautofocus call :compileTest Symbian_ECamAdvancedSettings_Post31 symbian_camera_ecamadvsettings
call :compileTest Symbian_DevVideoRecord symbian_camera_devvideorecord
call :compileTest AdvancedTouchFeedback advancedtouchfeedback
+call :compileTest CHWRMHaptics chwrmhaptics
call :compileTest MDS mds
call :compileTest MDS_25 mds_25
call :compileTest MDS_25_92MCL mds_25_92mcl
|