diff -r 5dc02b23752f -r 3e2da88830cd src/s60installs/deviceconfiguration/qtconfig.flm --- a/src/s60installs/deviceconfiguration/qtconfig.flm Tue Jul 06 15:10:48 2010 +0300 +++ b/src/s60installs/deviceconfiguration/qtconfig.flm Wed Aug 18 10:37:55 2010 +0300 @@ -12,21 +12,19 @@ MKSPECDIR:=$(EPOCROOT)/$(INSTALLPATH)/qt SOURCEDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/bin TOOLSSRCDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/src/tools +LANGUAGETOOLDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/tools/linguist CONFIGURE_APP:=configure$(DOTEXE) $(call makepath,$(TARGETDIR)) ifneq ($(filter linux,$(HOSTPLATFORM)),) PLATFORM:=$(PLATFORM.LINUX) - ifeq ($(XPLATFORM), symbian-sbsv2) - CONFIGURE_APP:=configure_symbian - endif else PLATFORM:=$(PLATFORM.WIN32) endif 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 +QT_TOOLS:= $(TOOLSSRCDIR)/uic $(TOOLSSRCDIR)/moc $(TOOLSSRCDIR)/rcc $(LANGUAGETOOLDIR)/lrelease SOURCE_TOOLS:=$(SOURCEDIR)/qmake$(DOTEXE) $(SOURCEDIR)/moc$(DOTEXE) $(SOURCEDIR)/rcc$(DOTEXE) $(SOURCEDIR)/uic$(DOTEXE) $(SOURCEDIR)/lrelease$(DOTEXE) define QtConfiguration