diff -r dee5afe5301f -r 3f74d0d4af4c src/s60installs/deviceconfiguration/qtconfig.mk --- a/src/s60installs/deviceconfiguration/qtconfig.mk Mon Mar 15 12:43:09 2010 +0200 +++ b/src/s60installs/deviceconfiguration/qtconfig.mk Thu Apr 08 14:19:33 2010 +0300 @@ -23,8 +23,8 @@ TARGETDIR := $(EPOC_ROOT)$(INSTALLPATH) SOURCEDIR := $(QT_ROOT)bin/ -TARGET_TOOLS := $(TARGETDIR)qmake$(DOTEXE) $(TARGETDIR)moc$(DOTEXE) $(TARGETDIR)rcc$(DOTEXE) $(TARGETDIR)uic$(DOTEXE) -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) +SOURCE_TOOLS := $(SOURCEDIR)qmake$(DOTEXE) $(SOURCEDIR)moc$(DOTEXE) $(SOURCEDIR)rcc$(DOTEXE) $(SOURCEDIR)uic$(DOTEXE) $(SOURCEDIR)/lrelease$(DOTEXE) XPLATFORM:=symbian-abld @@ -33,9 +33,12 @@ $(SOURCEDIR)qmake$(DOTEXE): $(QT_ROOT)configure$(DOTEXE) echo Configuring Qt for build on $(CONF_PLATFORM) with $(XPLATFORM) as build setup - cd $(CONFIGURE_ROOT) && $(QT_ROOT)configure$(DOTEXE) -platform $(CONF_PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS) + cd $(CONFIGURE_ROOT) && set INCLUDE= && set LIB= && $(QT_ROOT)configure$(DOTEXE) -platform $(CONF_PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS) + perl $(QT_ROOT)/bin/syncqt -base-dir $(QT_ROOT) -copy -oneway -outdir $(EPOC_ROOT)epoc32/include/ -outsubdir mw $(COPY) $(EPOC_ROOT)epoc32/gcc_mingw/bin/mingwm10.dll $(EPOC_ROOT)$(INSTALLPATH)mingwm10.dll $(COPY) $(EPOC_ROOT)epoc32/gcc_mingw/bin/mingwm10.dll $(QT_ROOT)bin/mingwm10.dll + perl $(EPOCROOT)epoc32/tools/emkdir.pl $(EPOC_ROOT)epoc32/tools/qt/mkspecs + xcopy /s $(CONFIGURE_ROOT)\mkspecs $(EPOCROOT)epoc32\tools\qt\mkspecs $(TARGET_TOOLS): $(SOURCE_TOOLS) $(COPY) $(SOURCEDIR)$(notdir $@) $@