diff -r dee5afe5301f -r 3f74d0d4af4c src/s60installs/deviceconfiguration/bld.inf
--- a/src/s60installs/deviceconfiguration/bld.inf	Mon Mar 15 12:43:09 2010 +0200
+++ b/src/s60installs/deviceconfiguration/bld.inf	Thu Apr 08 14:19:33 2010 +0300
@@ -17,8 +17,20 @@
 qtconfig.mk /epoc32/tools/makefile_templates/qt/qtconfig.mk
 qtconfig.meta /epoc32/tools/makefile_templates/qt/qtconfig.meta
 
+../../../mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm /epoc32/tools/makefile_templates/qt/
+../../../mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm /epoc32/tools/makefile_templates/qt/
+../../../mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm /epoc32/tools/makefile_templates/qt/
+../../../mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm /epoc32/tools/makefile_templates/qt/
+../../../mkspecs/symbian-sbsv2/flm/qt/qt.xml /epoc32/tools/makefile_templates/qt/
+../../../mkspecs/symbian-sbsv2/flm/qt/ts2qm.flm /epoc32/tools/makefile_templates/qt/
+
+#ifdef SBSV2
 wrappers/qmake.bat  /epoc32/tools/qmake.bat
 wrappers/qmake      /epoc32/tools/qmake
+#else
+wrappers/qmake_abld.bat  /epoc32/tools/qmake.bat
+wrappers/qmake_abld      /epoc32/tools/qmake
+#endif
 wrappers/moc.bat    /epoc32/tools/moc.bat
 wrappers/moc        /epoc32/tools/moc
 wrappers/rcc.bat    /epoc32/tools/rcc.bat
@@ -26,63 +38,14 @@
 wrappers/uic.bat    /epoc32/tools/uic.bat
 wrappers/uic        /epoc32/tools/uic
 wrappers/qt.conf    /epoc32/tools/qt/qt.conf
+wrappers/lrelease.bat /epoc32/tools/lrelease.bat
+wrappers/lrelease   /epoc32/tools/lrelease
 
-../../../mkspecs/symbian-abld/qmake.conf /epoc32/tools/qt/mkspecs/symbian-abld/qmake.conf
-../../../mkspecs/symbian-sbsv2/qmake.conf /epoc32/tools/qt/mkspecs/symbian-sbsv2/qmake.conf
-../../../mkspecs/common/symbian/stl-off/new /epoc32/tools/qt/mkspecs/common/symbian/stl-off/new
-../../../mkspecs/common/symbian/qplatformdefs.h /epoc32/tools/qt/mkspecs/common/symbian/qplatformdefs.h
-../../../mkspecs/common/symbian/symbian.conf /epoc32/tools/qt/mkspecs/common/symbian/symbian.conf
-../../../mkspecs/features/assistant.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/build_pass.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/dbusadaptors.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/dbusinterfaces.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/debug.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/debug_and_release.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/default_post.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/default_pre.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/designer.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/dll.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/exclusive_builds.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/help.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/include_source_dir.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/incredibuild_xge.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/lex.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/link_pkgconfig.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/moc.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/no_debug_info.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/qdbus.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/qt.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/qt_config.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/qt_functions.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/qtestlib.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/qtopia.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/qtopiainc.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/qtopialib.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/qttest_p4.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/release.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/resources.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/shared.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/silent.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/static.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/static_and_shared.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/staticlib.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/uic.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/uitools.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/use_c_linker.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/warn_off.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/warn_on.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/yacc.prf /epoc32/tools/qt/mkspecs/features/
-../../../mkspecs/features/symbian/application_icon.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/armcc_warnings.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/data_caging_paths.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/default_post.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/default_pre.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/epocallowdlldata.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/moc.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/platform_paths.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/qt.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/stl.prf /epoc32/tools/qt/mkspecs/features/symbian/
-../../../mkspecs/features/symbian/stl_off.prf /epoc32/tools/qt/mkspecs/features/symbian/
+/* export platform specific configuration */
+
+platform_paths.prf /epoc32/include/
+data_caging_paths.prf /epoc32/include/
+environment.prf /epoc32/tools/qt/mkspecs/features/
 
 //For UDA image
 ../../../confml/qt.confml                  CONFML_EXPORT_PATH(qt.confml,uda_content)
@@ -90,6 +53,13 @@
 ../../../content/apps/qt.sisx               CRML_EXPORT_PATH(../content/sis/,uda_content)
 ../../../content/apps/qt_stub.sis          /epoc32/data/z/system/install/qt_stub.sis
 
+//tools
+../../../bin/createpackage.bat         /epoc32/tools/createpackage.bat
+../../../bin/createpackage.pl          /epoc32/tools/createpackage.pl
+../../../bin/patch_capabilities.bat    /epoc32/tools/patch_capabilities.bat
+../../../bin/patch_capabilities.pl     /epoc32/tools/patch_capabilities.pl
+
+
 PRJ_MMPFILES
 
 
@@ -99,5 +69,5 @@
 PRJ_EXTENSIONS
 START EXTENSION qt/qtconfig
 OPTION QT_ROOT ..
-OPTION OPTIONS -opensource -confirm-license -openvg -script -no-scripttools -webkit -make make -graphicssystem openvg -no-phonon-backend -usedeffiles
+OPTION OPTIONS -opensource -confirm-license -openvg -script -no-scripttools -webkit -make make -graphicssystem openvg -no-phonon-backend -usedeffiles -dont-process
 END