--- a/src/s60installs/deviceconfiguration/qtconfig.flm	Mon Mar 15 12:43:09 2010 +0200
+++ b/src/s60installs/deviceconfiguration/qtconfig.flm	Thu Apr 08 14:19:33 2010 +0300
@@ -7,35 +7,29 @@
 
 # FLM to build Qt tools.
 
-QT_ROOT=../../..
+QT_ROOT:=../../..
 TARGETDIR:=$(EPOCROOT)/$(INSTALLPATH)
 SOURCEDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/bin
 TOOLSSRCDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/src/tools
-CONFIGURE_APP=configure$(DOTEXE)
+LANGUAGETOOLSDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/tools/linguist
+CONFIGURE_APP:=configure$(DOTEXE)
 
 $(call makepath,$(TARGETDIR))
 
 ifeq ($(OSTYPE),unix)
 PLATFORM:=$(PLATFORM.LINUX)
  ifeq ($(XPLATFORM), symbian-sbsv2)
- CONFIGURE_APP=configure_symbian
+ CONFIGURE_APP:=configure_symbian
  endif
 else
 PLATFORM:=$(PLATFORM.WIN32)
 endif
 
-TARGET_TOOLS:=$(TARGETDIR)/qmake$(DOTEXE) $(TARGETDIR)/moc$(DOTEXE) $(TARGETDIR)/rcc$(DOTEXE) $(TARGETDIR)/uic$(DOTEXE)
-QT_TOOLS:= $(TOOLSSRCDIR)/uic $(TOOLSSRCDIR)/moc $(TOOLSSRCDIR)/rcc
-TARGET_LIB:=$(TARGETDIR)/mingwm10.dll
-SOURCE_TOOLS:=$(SOURCEDIR)/qmake$(DOTEXE) $(SOURCEDIR)/moc$(DOTEXE) $(SOURCEDIR)/rcc$(DOTEXE) $(SOURCEDIR)/uic$(DOTEXE)
+TARGET_TOOLS:=$(TARGETDIR)/qmake$(DOTEXE) $(TARGETDIR)/moc$(DOTEXE) $(TARGETDIR)/rcc$(DOTEXE) $(TARGETDIR)/uic$(DOTEXE) $(TARGETDIR)/lrelease$(DOTEXE)
+QT_TOOLS:= $(TOOLSSRCDIR)/uic $(TOOLSSRCDIR)/moc $(TOOLSSRCDIR)/rcc $(LANGUAGETOOLSDIR)/lrelease
+SOURCE_TOOLS:=$(SOURCEDIR)/qmake$(DOTEXE) $(SOURCEDIR)/moc$(DOTEXE) $(SOURCEDIR)/rcc$(DOTEXE) $(SOURCEDIR)/uic$(DOTEXE) $(SOURCEDIR)/lrelease$(DOTEXE)
 
 define QtConfiguration
-$(TARGET_LIB): $(SOURCEDIR)/qmake$(DOTEXE)
-	$(call startrule,mingw_deploy) \
-	$(GNUCP) $(EPOCROOT)/epoc32/gcc_mingw/bin/mingwm10.dll $$@ ; \
-	$(GNUCP) $(EPOCROOT)/epoc32/gcc_mingw/bin/mingwm10.dll $(SOURCEDIR) \
-	$(call endrule,mingw_deploy)
-
 ifeq ($(OSTYPE),unix)
 $(TARGET_TOOLS): $(QT_TOOLS)
 else
@@ -64,9 +58,15 @@
 
 $(SOURCEDIR)/qmake$(DOTEXE): $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP)
 	$(call startrule,qtconf) \
-	cd $(EXTENSION_ROOT)/$(QT_ROOT) && \
-	$(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) -platform $(PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS) \
+	cd $(EXTENSION_ROOT)/$(QT_ROOT) && unset INCLUDE && unset LIB && $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) -platform $(PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS) \
 	$(call endrule,qtconf)
+	$(call startrule,syncqt) \
+	cd $(EXTENSION_ROOT)/$(QT_ROOT)/bin/ && \
+	perl syncqt -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -copy -oneway -outdir $(EPOCROOT)/epoc32/include/ -outsubdir mw
+	$(call endrule,syncqt)
+	$(call startrule,mkspecexport) \
+	$(GNUCP) -R $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(TARGETDIR)
+	$(call endrule,mkspecexport)
 endef
 
 # Here a variable named "done_<sanitised $SISFILE>" gets created
@@ -76,9 +76,9 @@
 ifeq ($($(GUARD)),)
 $(GUARD):=1
 ifeq ($(OSTYPE),unix)
-ALL:: $(QT_TOOLS) $(TARGET_TOOLS) $(TARGET_LIB)
+ALL:: $(QT_TOOLS) $(TARGET_TOOLS)
 else
-ALL:: $(TARGET_TOOLS) $(TARGET_LIB)
+ALL:: $(TARGET_TOOLS)
 endif
 $(eval $(call QtConfiguration))
 $(eval $(call whatmacro,$(TARGET_TOOLS)))