Changeset 846 for trunk/qmake

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• qmake/Makefile.unix (modified) (7 diffs)
• qmake/Makefile.win32 (modified) (7 diffs)
• qmake/Makefile.win32-g++ (modified) (9 diffs)
• qmake/Makefile.win32-g++-sh (modified) (8 diffs)
• qmake/cachekeys.h (modified) (1 diff)
• qmake/generators/mac/pbuilder_pbx.cpp (modified) (5 diffs)
• qmake/generators/mac/pbuilder_pbx.h (modified) (1 diff)
• qmake/generators/makefile.cpp (modified) (18 diffs)
• qmake/generators/makefile.h (modified) (2 diffs)
• qmake/generators/makefiledeps.cpp (modified) (1 diff)
• qmake/generators/makefiledeps.h (modified) (1 diff)
• qmake/generators/metamakefile.cpp (modified) (8 diffs)
• qmake/generators/metamakefile.h (modified) (3 diffs)
• qmake/generators/projectgenerator.cpp (modified) (5 diffs)
• qmake/generators/projectgenerator.h (modified) (1 diff)
• qmake/generators/symbian/initprojectdeploy_symbian.cpp (modified) (17 diffs)
• qmake/generators/symbian/initprojectdeploy_symbian.h (modified) (3 diffs)
• qmake/generators/symbian/symbian_makefile.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/qmake/generators/symbian/symbian_makefile.h )
• qmake/generators/symbian/symbiancommon.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/qmake/generators/symbian/symbiancommon.cpp )
• qmake/generators/symbian/symbiancommon.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/qmake/generators/symbian/symbiancommon.h )
• qmake/generators/symbian/symmake.cpp (modified) (29 diffs)
• qmake/generators/symbian/symmake.h (modified) (8 diffs)
• qmake/generators/symbian/symmake_abld.cpp (modified) (19 diffs)
• qmake/generators/symbian/symmake_abld.h (modified) (2 diffs)
• qmake/generators/symbian/symmake_sbsv2.cpp (modified) (18 diffs)
• qmake/generators/symbian/symmake_sbsv2.h (modified) (3 diffs)
• qmake/generators/unix/unixmake.cpp (modified) (12 diffs)
• qmake/generators/unix/unixmake.h (modified) (3 diffs)
• qmake/generators/unix/unixmake2.cpp (modified) (13 diffs)
• qmake/generators/win32/borland_bmake.cpp (modified) (2 diffs)
• qmake/generators/win32/borland_bmake.h (modified) (1 diff)
• qmake/generators/win32/mingw_make.cpp (modified) (6 diffs)
• qmake/generators/win32/mingw_make.h (modified) (1 diff)
• qmake/generators/win32/msbuild_objectmodel.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/qmake/generators/win32/msbuild_objectmodel.cpp )
• qmake/generators/win32/msbuild_objectmodel.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/qmake/generators/win32/msbuild_objectmodel.h )
• qmake/generators/win32/msvc_dsp.cpp (deleted)
• qmake/generators/win32/msvc_dsp.h (deleted)
• qmake/generators/win32/msvc_nmake.cpp (modified) (4 diffs)
• qmake/generators/win32/msvc_nmake.h (modified) (1 diff)
• qmake/generators/win32/msvc_objectmodel.cpp (modified) (8 diffs)
• qmake/generators/win32/msvc_objectmodel.h (modified) (5 diffs)
• qmake/generators/win32/msvc_vcproj.cpp (modified) (18 diffs)
• qmake/generators/win32/msvc_vcproj.h (modified) (4 diffs)
• qmake/generators/win32/msvc_vcxproj.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/qmake/generators/win32/msvc_vcxproj.cpp )
• qmake/generators/win32/msvc_vcxproj.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/qmake/generators/win32/msvc_vcxproj.h )
• qmake/generators/win32/winmakefile.cpp (modified) (6 diffs)
• qmake/generators/win32/winmakefile.h (modified) (2 diffs)
• qmake/generators/xmloutput.cpp (modified) (7 diffs)
• qmake/generators/xmloutput.h (modified) (7 diffs)
• qmake/main.cpp (modified) (2 diffs)
• qmake/meta.cpp (modified) (1 diff)
• qmake/meta.h (modified) (1 diff)
• qmake/option.cpp (modified) (16 diffs)
• qmake/option.h (modified) (5 diffs)
• qmake/project.cpp (modified) (46 diffs)
• qmake/project.h (modified) (8 diffs)
• qmake/property.cpp (modified) (4 diffs)
• qmake/property.h (modified) (1 diff)
• qmake/qmake.pri (modified) (3 diffs)
• qmake/qmake.pro (modified) (2 diffs)
• qmake/qmake_pch.h (modified) (1 diff)

trunk/qmake/Makefile.unix

@@ -10 +10 @@
      mingw_make.o option.o winmakefile.o projectgenerator.o \
      meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
-     borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \
+     borland_bmake.o msvc_vcproj.o msvc_vcxproj.o msvc_nmake.o msvc_objectmodel.o msbuild_objectmodel.o \
      symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o \
-     registry.o \
-     epocroot.o \
-     gnumake.o
+     symbiancommon.o registry.o epocroot.o gnumake.o
 
 #qt code
@@ -34 +32 @@
            generators/mac/pbuilder_pbx.cpp generators/mac/xmloutput.cpp generators/metamakefile.cpp \
            generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \
-           generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
+           generators/win32/msvc_vcproj.cpp generators/win32/msvc_vcxproj.cpp generators/win32/msvc_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
            generators/symbian/symmake.cpp generators/symbian/initprojectdeploy_symbian.cpp \
            $(SOURCE_PATH)/tools/shared/windows/registry.cpp \
            $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp \
            generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \
+           generaters/symbian/symbiancommon.cpp \
            generators/os2/gnumake.cpp \
            $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \
@@ -71 +70 @@
            -I$(SOURCE_PATH)/tools/shared \
            -DQT_NO_PCRE \
-           -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
+           -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT \
            -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
            -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
@@ -238 +237 @@
         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
 
-metamakefile.o: generators/metamakefile.cpp
+metamakefile.o: generators/metamakefile.cpp generators/symbian/symbian_makefile.h
         $(CXX) -c -o $@ $(CXXFLAGS) generators/metamakefile.cpp
 
@@ -268 +267 @@
         $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
 
+msbuild_objectmodel.o: generators/win32/msbuild_objectmodel.cpp
+        $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msbuild_objectmodel.cpp
+
+msvc_vcxproj.o: generators/win32/msvc_vcxproj.cpp
+        $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_vcxproj.cpp
+
 msvc_nmake.o: generators/win32/msvc_nmake.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_nmake.cpp
@@ -274 +279 @@
         $(CXX) -c -o $@ $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp
 
-msvc_dsp.o: generators/win32/msvc_dsp.cpp
-        $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_dsp.cpp
-
 symmake.o: generators/symbian/symmake.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake.cpp
@@ -285 +287 @@
 symmake_sbsv2.o: generators/symbian/symmake_sbsv2.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
+
+symbiancommon.o: generators/symbian/symbiancommon.cpp
+        $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symbiancommon.cpp
 
 initprojectdeploy_symbian.o: generators/symbian/initprojectdeploy_symbian.cpp

trunk/qmake/Makefile.win32

@@ -1 @@
-!IF "$(QMAKESPEC)" == "win32-msvc" || "$(QMAKESPEC)" == "win32-msvc.net" || "$(QMAKESPEC)" == "win32-msvc2002" || "$(QMAKESPEC)" == "win32-msvc2003" || "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-icc"
+!IF "$(QMAKESPEC)" == "win32-msvc" || "$(QMAKESPEC)" == "win32-msvc.net" || "$(QMAKESPEC)" == "win32-msvc2002" || "$(QMAKESPEC)" == "win32-msvc2003" || "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-icc"
 
 !if "$(SOURCE_PATH)" == ""
@@ -24 +24 @@
 #
 !if "$(QMAKESPEC)" == "win32-msvc2005"
-CFLAGS      = /Zc:wchar_t-
-!endif
-
-CFLAGS       = -c -Fo$@ \
+CFLAGS_EXTRA      = /Zc:wchar_t-
+!elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010"
+CFLAGS_EXTRA      = /MP
+!endif
+
+CFLAGS_BARE = -c -Fo./ \
               -W3 -nologo -O2 \
+              $(CFLAGS_EXTRA) \
               -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian -Igenerators\os2 \
               -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
@@ -39 +42 @@
               -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \
               -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_NO_PCRE -DQT_BOOTSTRAPPED \
-              $(CFLAGS)
-CXXFLAGS    = $(CFLAGS)
+              -DQLIBRARYINFO_EPOCROOT
+CFLAGS   = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS)
+
+CXXFLAGS_BARE = $(CFLAGS_BARE)
+CXXFLAGS = $(CFLAGS)
+
 LFLAGS      =
 LIBS        = ole32.lib advapi32.lib
 LINKQMAKE   = $(LINK) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
 ADDCLEAN    = vc60.pdb vc70.pdb qmake.pdb qmake.ilk
+
 !ELSE
-
-#
-# specific stuff for Borland make
-#
-!if !$d(BCB)
-BCB = $(MAKEDIR)\..
-!endif
-CXX         = bcc32
-CFLAGS      = -c -o$@ \
-        -tWR -w -w-hid -w-use -O1 \
-        -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \
-        -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
-        -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
-        -I$(BUILD_PATH)\src\corelib\global \
-        -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \
-    -I$(SOURCE_PATH)\tools\shared \
-        -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \
-        -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \
-        -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT
-CXXFLAGS    = $(CFLAGS)
-LFLAGS      = -L$(BCB)\lib -c -x -Gn -ap -Tpe c0x32.obj
-LIBS        = import32.lib cw32i.lib
-LINKQMAKE   = ilink32 $(LFLAGS) $(OBJS) $(QTOBJS), qmake.exe,,$(LIBS)
-ADDCLEAN    = qmake.tds
+!ERROR Unsupported compiler for this Makefile
 !ENDIF
 
@@ -76 +61 @@
               option.obj winmakefile.obj projectgenerator.obj property.obj meta.obj \
               makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \
-              borland_bmake.obj msvc_nmake.obj msvc_dsp.obj msvc_vcproj.obj \
-              msvc_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \
-              registry.obj \
-              epocroot.obj \
-              symmake_abld.obj symmake_sbsv2.obj gnumake.obj
+              borland_bmake.obj msvc_nmake.obj msvc_vcproj.obj msvc_vcxproj.obj \
+              msvc_objectmodel.obj msbuild_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \
+              symmake_abld.obj symmake_sbsv2.obj symbiancommon.obj registry.obj epocroot.obj gnumake.obj
 
 !IFDEF QMAKE_OPENSOURCE_EDITION
@@ -103 +86 @@
         qabstractfileengine.obj \
         qfsfileengine_win.obj \
+        qsystemlibrary.obj \
         qfsfileengine_iterator_win.obj \
         qfileinfo.obj \
@@ -136 +120 @@
 
 qmake.exe: $(OBJS) $(QTOBJS)
-        $(LINKQMAKE)
+        $(LINKQMAKE) qmake_pch.obj
         -copy qmake.exe $(BUILD_PATH)\bin\qmake.exe
 
 clean::
-        -del qbitarray.obj
-        -del qbuffer.obj
-        -del qcryptographichash.obj
-        -del qlinkedlist.obj
-        -del qfsfileengine.obj
-        -del qfsfileengine_iterator.obj
-        -del qbytearray.obj
-        -del qvsnprintf.obj
-        -del qbytearraymatcher.obj
-        -del qdatetime.obj
-        -del qdir.obj
-        -del qdiriterator.obj
-        -del qfile.obj
-        -del qtemporaryfile.obj
-        -del qabstractfileengine.obj
-        -del qfsfileengine_win.obj
-        -del qfsfileengine_iterator_win.obj
-        -del qfileinfo.obj
-        -del qglobal.obj
-        -del qhash.obj
-        -del qiodevice.obj
-        -del qlist.obj
-        -del qlocale.obj
-        -del qmalloc.obj
-        -del qmap.obj
-        -del qregexp.obj
-        -del qtextcodec.obj
-        -del qutfcodec.obj
-        -del qstring.obj
-        -del qstringlist.obj
-        -del qtextstream.obj
-        -del qdatastream.obj
-        -del quuid.obj
-        -del qvector.obj
-        -del qsettings.obj
-        -del qlibraryinfo.obj
-        -del qvariant.obj
-        -del qurl.obj
-        -del qsettings_win.obj
-        -del qmetatype.obj
-        -del project.obj
-        -del main.obj
-        -del makefile.obj
-        -del unixmake.obj
-        -del unixmake2.obj
-        -del mingw_make.obj
-        -del option.obj
-        -del winmakefile.obj
-        -del projectgenerator.obj
-        -del property.obj
-        -del meta.obj
-        -del makefiledeps.obj
-        -del metamakefile.obj
-        -del xmloutput.obj
-        -del borland_bmake.obj
-        -del msvc_nmake.obj
-        -del msvc_dsp.obj
-        -del msvc_vcproj.obj
-        -del msvc_objectmodel.obj
-        -del symmake.obj
-        -del symmake_abld.obj
-        -del symmake_sbsv2.obj
-        -del initprojectdeploy_symbian.obj
-        -del registry.obj
-        -del epocroot.obj
-        -del gnumake.obj
-        -del pbuilder_pbx.obj
-        -del qxmlstream.obj
-        -del qxmlutils.obj
-        -del qnumeric.obj
+        -del $(QTOBJS)
+        -del $(OBJS)
+        -del qmake_pch.obj
+        -del qmake_pch.pch
+        -del qsystemlibrary.obj
         -del vc60.pdb
         -del vc70.pdb
@@ -231 +150 @@
         $(CXX) $(CXXFLAGS) $<
 
-qsettings_win.obj: $(SOURCE_PATH)\src\corelib\io\qsettings_win.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qsettings_win.cpp
-
-qsettings.obj: $(SOURCE_PATH)\src\corelib\io\qsettings.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qsettings.cpp
-
-qlibraryinfo.obj: $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp
-
-qnumeric.obj: $(SOURCE_PATH)\src\corelib\global\qnumeric.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qnumeric.cpp
-
-qvariant.obj: $(SOURCE_PATH)\src\corelib\kernel\qvariant.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\kernel\qvariant.cpp
-
-qurl.obj: $(SOURCE_PATH)\src\corelib\io\qurl.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qurl.cpp
-
-qtextstream.obj: $(SOURCE_PATH)\src\corelib\io\qtextstream.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qtextstream.cpp
-
-qdatastream.obj: $(SOURCE_PATH)\src\corelib\io\qdatastream.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qdatastream.cpp
-
-qiodevice.obj: $(SOURCE_PATH)\src\corelib\io\qiodevice.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qiodevice.cpp
-
-qmalloc.obj: $(SOURCE_PATH)\src\corelib\global\qmalloc.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qmalloc.cpp
-
-qglobal.obj: $(SOURCE_PATH)\src\corelib\global\qglobal.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qglobal.cpp
-
-qhash.obj: $(SOURCE_PATH)\src\corelib\tools\qhash.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qhash.cpp
-
-qbytearray.obj: $(SOURCE_PATH)\src\corelib\tools\qbytearray.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qbytearray.cpp
-
-qcryptographichash.obj: $(SOURCE_PATH)\src\corelib\tools\qcryptographichash.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qcryptographichash.cpp
-
-qvsnprintf.obj: $(SOURCE_PATH)\src\corelib\tools\qvsnprintf.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qvsnprintf.cpp
-
-qbytearraymatcher.obj: $(SOURCE_PATH)\src\corelib\tools\qbytearraymatcher.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qbytearraymatcher.cpp
-
-qchar.obj: $(SOURCE_PATH)\src\corelib\tools\qchar.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qchar.cpp
-
-qutfcodec.obj: $(SOURCE_PATH)\src\corelib\codecs\qutfcodec.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\codecs\qutfcodec.cpp
-
-qstring.obj: $(SOURCE_PATH)\src\corelib\tools\qstring.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstring.cpp
-
-qstringmatcher.obj: $(SOURCE_PATH)\src\corelib\tools\qstringmatcher.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstringmatcher.cpp
-
-qlocale.obj: $(SOURCE_PATH)\src\corelib\tools\qlocale.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlocale.cpp
-
-quuid.obj: $(SOURCE_PATH)\src\corelib\plugin\quuid.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\plugin\quuid.cpp
-
-qbuffer.obj: $(SOURCE_PATH)\src\corelib\io\qbuffer.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qbuffer.cpp
-
-qlist.obj: $(SOURCE_PATH)\src\corelib\tools\qlist.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlist.cpp
-
-qlinkedlist.obj: $(SOURCE_PATH)\src\corelib\tools\qlinkedlist.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlinkedlist.cpp
-
-qfile.obj: $(SOURCE_PATH)\src\corelib\io\qfile.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfile.cpp
-
-qtemporaryfile.obj: $(SOURCE_PATH)\src\corelib\io\qtemporaryfile.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qtemporaryfile.cpp
-
-qfsfileengine_win.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine_win.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine_win.cpp
-
-qfsfileengine_iterator_win.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator_win.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator_win.cpp
-
-qfsfileengine.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine.cpp
-
-qfsfileengine_iterator.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator.cpp
-
-qabstractfileengine.obj: $(SOURCE_PATH)\src\corelib\io\qabstractfileengine.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qabstractfileengine.cpp
-
-qtextcodec.obj: $(SOURCE_PATH)\src\corelib\codecs\qtextcodec.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\codecs\qtextcodec.cpp
-
-qregexp.obj: $(SOURCE_PATH)\src\corelib\tools\qregexp.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qregexp.cpp
-
-qvector.obj: $(SOURCE_PATH)\src\corelib\tools\qvector.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qvector.cpp
-
-qbitarray.obj: $(SOURCE_PATH)\src\corelib\tools\qbitarray.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qbitarray.cpp
-
-qdir.obj: $(SOURCE_PATH)\src\corelib\io\qdir.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qdir.cpp
-
-qdiriterator.obj: $(SOURCE_PATH)\src\corelib\io\qdiriterator.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qdiriterator.cpp
-
-qmetatype.obj: $(SOURCE_PATH)\src\corelib\kernel\qmetatype.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\kernel\qmetatype.cpp
-
-qfileinfo.obj: $(SOURCE_PATH)\src\corelib\io\qfileinfo.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfileinfo.cpp
-
-qdatetime.obj: $(SOURCE_PATH)\src\corelib\tools\qdatetime.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qdatetime.cpp
-
-qstringlist.obj: $(SOURCE_PATH)\src\corelib\tools\qstringlist.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstringlist.cpp
-
-qmap.obj: $(SOURCE_PATH)\src\corelib\tools\qmap.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qmap.cpp
-
-qunicodetables.obj: $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp
-
-makefile.obj: $(SOURCE_PATH)/qmake/generators\makefile.cpp
-        $(CXX) $(CXXFLAGS) generators\makefile.cpp
-
-unixmake.obj: $(SOURCE_PATH)/qmake/generators\unix\unixmake.cpp
-        $(CXX) $(CXXFLAGS) generators\unix\unixmake.cpp
-
-unixmake2.obj: $(SOURCE_PATH)/qmake/generators\unix\unixmake2.cpp
-        $(CXX) $(CXXFLAGS) generators\unix\unixmake2.cpp
-
-winmakefile.obj: $(SOURCE_PATH)/qmake/generators/win32/winmakefile.cpp
-        $(CXX) $(CXXFLAGS) generators/win32/winmakefile.cpp
-
-borland_bmake.obj: $(SOURCE_PATH)/qmake/generators/win32/borland_bmake.cpp
-        $(CXX) $(CXXFLAGS) generators/win32/borland_bmake.cpp
-
-mingw_make.obj: $(SOURCE_PATH)/qmake/generators/win32/mingw_make.cpp
-        $(CXX) $(CXXFLAGS) generators/win32/mingw_make.cpp
-
-msvc_nmake.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_nmake.cpp
-        $(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp
-
-msvc_dsp.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_dsp.cpp
-        $(CXX) $(CXXFLAGS) generators/win32/msvc_dsp.cpp
-
-msvc_vcproj.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp
-        $(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
-
-msvc_objectmodel.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp
-        $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
-
-symmake.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
-        $(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
-
-symmake_abld.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
-        $(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp
-
-symmake_sbsv2.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
-        $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
-
-initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
-        $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
-
-registry.obj: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp
-
-epocroot.obj: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
-
-gnumake.obj: $(SOURCE_PATH)/qmake/generators/os2/gnumake.cpp
-        $(CXX) $(CXXFLAGS) generators/os2/gnumake.cpp
-
-md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
-
-project.obj: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
-        $(CXX) $(CXXFLAGS) project.cpp
-
-meta.obj: $(SOURCE_PATH)/qmake/meta.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
-        $(CXX) $(CXXFLAGS) meta.cpp
-
-main.obj: $(SOURCE_PATH)/qmake/main.cpp $(SOURCE_PATH)/qmake/project.h
-        $(CXX) $(CXXFLAGS) main.cpp
-
-option.obj: $(SOURCE_PATH)/qmake/option.cpp $(SOURCE_PATH)/qmake/option.h
-        $(CXX) $(CXXFLAGS) option.cpp
-
-property.obj: $(SOURCE_PATH)/qmake/property.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
-        $(CXX) $(CXXFLAGS) property.cpp
-
-projectgenerator.obj: $(SOURCE_PATH)/qmake/generators/projectgenerator.cpp
-        $(CXX) $(CXXFLAGS) generators/projectgenerator.cpp
-
-pbuilder_pbx.obj: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp
-        $(CXX) $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp
-
-makefiledeps.obj: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp
-        $(CXX) $(CXXFLAGS) generators/makefiledeps.cpp
-
-metamakefile.obj: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
-        $(CXX) $(CXXFLAGS) generators/metamakefile.cpp
-
-xmloutput.obj: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
-        $(CXX) $(CXXFLAGS) generators/xmloutput.cpp
-
-qxmlstream.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
-
-qxmlutils.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp
+$(OBJS): qmake_pch.obj
+
+qsystemlibrary.obj: $(SOURCE_PATH)\src\corelib\plugin\qsystemlibrary.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\plugin\qsystemlibrary.cpp
+
+$(QTOBJS): qmake_pch.obj
+
+qmake_pch.obj:
+        $(CXX) $(CXXFLAGS_BARE) -c -Yc -Fpqmake_pch.pch -TP qmake_pch.h
+
+{$(SOURCE_PATH)\qmake\generators\mac}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\qmake\generators\symbian}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\qmake\generators\unix}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\qmake\generators\win32}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\qmake\generators\os2}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+        {$(SOURCE_PATH)\qmake\generators}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\qmake}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\src\3rdparty\md5}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\src\corelib\codecs}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\src\corelib\global}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\src\corelib\io}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\src\corelib\kernel}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\src\corelib\plugin}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\src\corelib\tools}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\src\corelib\xml}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\tools\shared\symbian}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<
+
+{$(SOURCE_PATH)\tools\shared\windows}.cpp{}.obj::
+        $(CXX) $(CXXFLAGS) $<

trunk/qmake/Makefile.win32-g++

@@ -26 +26 @@
                 -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
                 -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
-                -DQT_BOOTSTRAPPED
+                -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT
 CXXFLAGS    =   $(CFLAGS)
-LFLAGS      =
+LFLAGS      = -static-libgcc -static-libstdc++ -s
 LIBS        = -lole32 -luuid
 LINKQMAKE   =   g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
@@ -38 +38 @@
               option.o winmakefile.o projectgenerator.o property.o meta.o \
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
-              borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
-              msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
-              registry.o \
-              epocroot.o \
-              symmake_abld.o symmake_sbsv2.o gnumake.o
+              borland_bmake.o msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \
+              msvc_objectmodel.o msbuild_objectmodel.o symmake.o initprojectdeploy_symbian.o \
+              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o \
+              gnumake.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
@@ -82 +81 @@
         qstring.o \
         qstringlist.o \
+        qsystemlibrary.o \
         qtextstream.o \
         quuid.o \
@@ -237 +237 @@
         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp
 
+qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
+
 qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp
         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp
@@ -261 +264 @@
         $(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp
 
-msvc_dsp.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_dsp.cpp
-        $(CXX) $(CXXFLAGS) generators/win32/msvc_dsp.cpp
-
 msvc_vcproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp
         $(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
@@ -270 +270 @@
         $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
 
+msvc_vcxproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcxproj.cpp
+        $(CXX) $(CXXFLAGS) generators/win32/msvc_vcxproj.cpp
+
+msbuild_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msbuild_objectmodel.cpp
+        $(CXX) $(CXXFLAGS) generators/win32/msbuild_objectmodel.cpp
+
 symmake.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
         $(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
@@ -279 +285 @@
         $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
 
+symbiancommon.o: $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.cpp
+        $(CXX) $(CXXFLAGS) generators/symbian/symbiancommon.cpp
+
 initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
         $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
@@ -315 +324 @@
         $(CXX) $(CXXFLAGS) generators/makefiledeps.cpp
 
-metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
+metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp $(SOURCE_PATH)/qmake/generators/symbian/symbian_makefile.h
         $(CXX) $(CXXFLAGS) generators/metamakefile.cpp
 
@@ -326 +335 @@
 qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+

trunk/qmake/Makefile.win32-g++-sh

@@ -26 +26 @@
                 -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
                 -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
-                -DQT_BOOTSTRAPPED
+                -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT
 CXXFLAGS    =   $(CFLAGS)
-LFLAGS      =
+LFLAGS      = -static-libgcc -static-libstdc++ -s
 LIBS        = -lole32 -luuid
 LINKQMAKE   =   g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
@@ -38 +38 @@
               option.o winmakefile.o projectgenerator.o property.o meta.o \
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
-              borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
-              msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
-              registry.o \
-              epocroot.o \
-              symmake_abld.o symmake_sbsv2.o gnumake.o
+              borland_bmake.o msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \
+              msvc_objectmodel.o msbuild_objectmodel.o symmake.o initprojectdeploy_symbian.o \
+              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o \
+              gnumake.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
@@ -82 +81 @@
         qstring.o \
         qstringlist.o \
+        qsystemlibrary.o \
         qtextstream.o \
         quuid.o \
@@ -236 +236 @@
         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp
 
+qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
+
 qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp
         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp
@@ -260 +263 @@
         $(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp
 
-msvc_dsp.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_dsp.cpp
-        $(CXX) $(CXXFLAGS) generators/win32/msvc_dsp.cpp
-
 msvc_vcproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp
         $(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
@@ -269 +269 @@
         $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
 
+msvc_vcxproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcxproj.cpp
+        $(CXX) $(CXXFLAGS) generators/win32/msvc_vcxproj.cpp
+
+msbuild_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msbuild_objectmodel.cpp
+        $(CXX) $(CXXFLAGS) generators/win32/msbuild_objectmodel.cpp
+
 symmake.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
         $(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
@@ -278 +284 @@
         $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
 
+symbiancommon.o: $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.cpp
+        $(CXX) $(CXXFLAGS) generators/symbian/symbiancommon.cpp
+
 initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
         $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
@@ -314 +323 @@
         $(CXX) $(CXXFLAGS) generators/makefiledeps.cpp
 
-metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
+metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp $(SOURCE_PATH)/qmake/generators/symbian/symbian_makefile.h
         $(CXX) $(CXXFLAGS) generators/metamakefile.cpp
 

trunk/qmake/cachekeys.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/generators/mac/pbuilder_pbx.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -524 +524 @@
             QTextStream mkt(&mkf);
             writeHeader(mkt);
-            mkt << "QMAKE    = "        << (project->isEmpty("QMAKE_QMAKE") ?
-                                            QString((QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmake")) :
-                                            var("QMAKE_QMAKE")) << endl;
+            mkt << "QMAKE    = " << var("QMAKE_QMAKE") << endl;
             writeMakeQmake(mkt);
             mkt.flush();
@@ -543 +541 @@
           << "\t\t\t" << writeSettings("neededFileNames", QStringList(), SettingsAsList, 4) << ";" << "\n"
           << "\t\t\t" << writeSettings("shellPath", "/bin/sh") << ";" << "\n"
-          << "\t\t\t" << writeSettings("shellScript", fixForOutput("make -C " + escapeFilePath(qmake_getpwd()) + " -f " + escapeFilePath(mkfile))) << ";" << "\n"
+          << "\t\t\t" << writeSettings("shellScript", fixForOutput("make -C " + escapeFilePath(qmake_getpwd()) + " -f '" + escapeFilePath(mkfile) + "'")) << ";" << "\n"
           << "\t\t" << "};" << "\n";
     }
@@ -792 +790 @@
           << "\t\t\t" << writeSettings("neededFileNames", fixListForOutput("QMAKE_PBX_OBJ"), SettingsAsList, 4) << ";" << "\n"
           << "\t\t\t" << writeSettings("shellPath", "/bin/sh") << ";" << "\n"
-          << "\t\t\t" << writeSettings("shellScript", fixForOutput("make -C " + escapeFilePath(qmake_getpwd()) + " -f " + escapeFilePath(mkfile))) << ";" << "\n"
+          << "\t\t\t" << writeSettings("shellScript", fixForOutput("make -C " + escapeFilePath(qmake_getpwd()) + " -f '" + escapeFilePath(mkfile) + "'")) << ";" << "\n"
           << "\t\t" << "};" << "\n";
    }
@@ -971 +969 @@
           << "\t\t\t" << writeSettings("neededFileNames", QStringList(), SettingsAsList, 4) << ";" << "\n"
           << "\t\t\t" << writeSettings("shellPath", "/bin/sh") << "\n"
-          << "\t\t\t" << writeSettings("shellScript", fixForOutput("make -C " + escapeFilePath(qmake_getpwd()) + " -f " + escapeFilePath(mkfile))) << ";" << "\n"
+          << "\t\t\t" << writeSettings("shellScript", fixForOutput("make -C " + escapeFilePath(qmake_getpwd()) + " -f '" + escapeFilePath(mkfile) + "'")) << ";" << "\n"
           << "\t\t" << "};" << "\n";
     }

trunk/qmake/generators/mac/pbuilder_pbx.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/generators/makefile.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -467 +467 @@
         const QStringList &subs = v["QMAKE_SUBSTITUTES"];
         for(int i = 0; i < subs.size(); ++i) {
-            if(!subs.at(i).endsWith(".in")) {
-                warn_msg(WarnLogic, "Substitute '%s' does not end with '.in'",
-                         subs.at(i).toLatin1().constData());
-                continue;
-            }
-            QFile in(fileFixify(subs.at(i))), out(fileInfo(subs.at(i)).fileName());
-            if(out.fileName().endsWith(".in"))
-                out.setFileName(out.fileName().left(out.fileName().length()-3));
+            QString inn = subs.at(i) + ".input", outn = subs.at(i) + ".output";
+            if (v.contains(inn) || v.contains(outn)) {
+                if (!v.contains(inn) || !v.contains(outn)) {
+                    warn_msg(WarnLogic, "Substitute '%s' has only one of .input and .output",
+                             subs.at(i).toLatin1().constData());
+                    continue;
+                }
+                const QStringList &tinn = v[inn], &toutn = v[outn];
+                if (tinn.length() != 1) {
+                    warn_msg(WarnLogic, "Substitute '%s.input' does not have exactly one value",
+                             subs.at(i).toLatin1().constData());
+                    continue;
+                }
+                if (toutn.length() != 1) {
+                    warn_msg(WarnLogic, "Substitute '%s.output' does not have exactly one value",
+                             subs.at(i).toLatin1().constData());
+                    continue;
+                }
+                inn = tinn.first();
+                outn = toutn.first();
+            } else {
+                inn = subs.at(i);
+                if(!inn.endsWith(".in")) {
+                    warn_msg(WarnLogic, "Substitute '%s' does not end with '.in'",
+                             inn.toLatin1().constData());
+                    continue;
+                }
+                outn = inn.left(inn.length()-3);
+            }
+            QFile in(fileFixify(inn));
+            QFile out(fileFixify(outn, qmake_getpwd(), Option::output_dir));
             if(in.open(QFile::ReadOnly)) {
                 QString contents;
@@ -529 +552 @@
                     QString old = QString::fromUtf8(out.readAll());
                     if(contents == old) {
-                        v["QMAKE_INTERNAL_INCLUDED_FILES"].append(subs.at(i));
+                        v["QMAKE_INTERNAL_INCLUDED_FILES"].append(in.fileName());
                         continue;
                     }
@@ -539 +562 @@
                     }
                 }
+                mkdir(QFileInfo(out).absolutePath());
                 if(out.open(QFile::WriteOnly)) {
-                    v["QMAKE_INTERNAL_INCLUDED_FILES"].append(subs.at(i));
+                    v["QMAKE_INTERNAL_INCLUDED_FILES"].append(in.fileName());
                     out.write(contents.toUtf8());
                 } else {
@@ -807 +831 @@
 
     // escape qmake command
-    if (!project->isEmpty("QMAKE_QMAKE")) {
-        project->values("QMAKE_QMAKE") = escapeFilePaths(project->values("QMAKE_QMAKE"));
-    }
+    QStringList &qmk = project->values("QMAKE_QMAKE");
+    qmk = escapeFilePaths(qmk);
 }
 
@@ -982 +1005 @@
                 libs << "QMAKE_LIBS_PRIVATE";
             for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
-                t << project->values((*it)).join(" ") << " ";
+                t << project->values((*it)).join(" ").replace('\\', "\\\\") << " ";
         }
         t << endl;
@@ -1276 +1299 @@
                 if(!dirstr.endsWith(Option::dir_sep))
                     dirstr += Option::dir_sep;
-                if(exists(wild)) { //real file
+                bool is_target = (wild == fileFixify(var("TARGET"), FileFixifyAbsolute));
+                if(is_target || exists(wild)) { //real file or target
                     QString file = wild;
                     QFileInfo fi(fileInfo(wild));
@@ -1290 +1314 @@
                     if (fi.isDir())
                        cmd = inst_prefix + "$(INSTALL_DIR)";
-                    else if (fi.isExecutable())
+                    else if (is_target || fi.isExecutable())
                        cmd = inst_prefix + "$(INSTALL_PROGRAM)";
                     else
@@ -1786 +1810 @@
         QStringList tmp_dep = project->values((*it) + ".depends");
         QString tmp_dep_cmd;
+        QString dep_cd_cmd;
         if(!project->isEmpty((*it) + ".depend_command")) {
             int argv0 = -1;
@@ -1799 +1824 @@
                 if(exists(c)) {
                     cmdline[argv0] = escapeFilePath(Option::fixPathToLocalOS(cmdline.at(argv0), false));
-                    tmp_dep_cmd = cmdline.join(" ");
                 } else {
                     cmdline[argv0] = escapeFilePath(cmdline.at(argv0));
                 }
-            }
+                QFileInfo cmdFileInfo(cmdline[argv0]);
+                if (!cmdFileInfo.isAbsolute() || cmdFileInfo.exists())
+                    tmp_dep_cmd = cmdline.join(" ");
+            }
+            dep_cd_cmd = QLatin1String("cd ")
+                 + escapeFilePath(Option::fixPathToLocalOS(Option::output_dir, false))
+                 + QLatin1String(" && ");
         }
         QStringList &vars = project->values((*it) + ".variables");
@@ -1860 +1890 @@
             if(tmp_clean.indexOf("${QMAKE_") == -1) {
                 t << "\n\t" << del_statement << " " << tmp_clean << del_suffix;
-                if (isForSymbian())
-                    t << " 2> NUL"; // Eliminate unnecessary warnings
                 wrote_clean = true;
             }
@@ -1919 +1947 @@
                     QString dep_cmd = replaceExtraCompilerVariables(tmp_dep_cmd, (*input),
                                                                     tmp_out);
-                    dep_cmd = fixEnvVariables(dep_cmd);
+                    dep_cmd = dep_cd_cmd + fixEnvVariables(dep_cmd);
                     if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {
                         QString indeps;
@@ -2017 +2045 @@
                 char buff[256];
                 QString dep_cmd = replaceExtraCompilerVariables(tmp_dep_cmd, (*input), out);
-                dep_cmd = fixEnvVariables(dep_cmd);
+                dep_cmd = dep_cd_cmd + fixEnvVariables(dep_cmd);
                 if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {
                     QString indeps;
@@ -2154 +2182 @@
 MakefileGenerator::writeStubMakefile(QTextStream &t)
 {
-    t << "QMAKE    = "        << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
+    t << "QMAKE    = " << var("QMAKE_QMAKE") << endl;
     QStringList &qut = project->values("QMAKE_EXTRA_TARGETS");
     for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
@@ -2209 +2237 @@
     if(!Option::mkfile::qmakespec_commandline.isEmpty())
         ret += " -spec " + specdir(outdir);
-    if(Option::target_mode == Option::TARG_MAC9_MODE)
-        ret += " -mac9";
-    else if(Option::target_mode == Option::TARG_MACX_MODE)
-        ret += " -macx";
-    else if(Option::target_mode == Option::TARG_UNIX_MODE)
-        ret += " -unix";
-    else if(Option::target_mode == Option::TARG_WIN_MODE)
-        ret += " -win32";
+    if (Option::target_mode_overridden) {
+        if (Option::target_mode == Option::TARG_MACX_MODE)
+            ret += " -macx";
+        else if (Option::target_mode == Option::TARG_UNIX_MODE)
+            ret += " -unix";
+        else if (Option::target_mode == Option::TARG_WIN_MODE)
+            ret += " -win32";
+    }
     else if(Option::target_mode == Option::TARG_OS2_MODE)
         ret += " -os2";
@@ -2271 +2299 @@
     t << "# Template: " << var("TEMPLATE") << endl;
     if(!project->isActiveConfig("build_pass"))
-        t << "# Command: " << build_args().replace("$(QMAKE)",
-                      (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE"))) << endl;
+        t << "# Command: " << build_args().replace("$(QMAKE)", var("QMAKE_QMAKE")) << endl;
     t << "#############################################################################" << endl;
     t << endl;
@@ -2405 +2432 @@
         /* Calling Option::fixPathToTargetOS() is necessary for MinGW/MSYS, which requires
          * back-slashes to be turned into slashes. */
-        t << "QMAKE         = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
+        t << "QMAKE         = " << var("QMAKE_QMAKE") << endl;
         t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
         t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
@@ -2733 +2760 @@
                 if(exists(Option::fixPathToLocalOS(specdir()+QDir::separator()+"qmake.conf")))
                     t << escapeDependencyPath(specdir() + Option::dir_sep + "qmake.conf") << " ";
-                else if(exists(Option::fixPathToLocalOS(specdir()+QDir::separator()+"tmake.conf")))
-                    t << escapeDependencyPath(specdir() + Option::dir_sep + "tmake.conf") << " ";
             }
             const QStringList &included = project->values("QMAKE_INTERNAL_INCLUDED_FILES");

trunk/qmake/generators/makefile.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -248 +248 @@
     virtual bool mergeBuildProject(MakefileGenerator * /*other*/) { return false; }
     virtual bool openOutput(QFile &, const QString &build) const;
-    virtual bool isDosLikeShell() const { return Option::target_mode == Option::TARG_WIN_MODE ||
-                                                 Option::target_mode == Option::TARG_OS2_MODE; }
+    virtual bool isDosLikeShell() const { return Option::host_mode == Option::HOST_WIN_MODE ||
+                                                 Option::host_mode == Option::HOST_OS2_MODE; }
+    virtual bool isForSymbianSbsv2() const { return false; } // FIXME: killme - i'm ugly!
+
+    /* The next one is to avoid having SymbianCommonGenerator as a virtually
+       inherited class of this class. Instead it is without a base class
+       (avoiding the virtual inheritance problem), and is allowed to use
+       functions defined in here.
+
+       To illustrate:
+                               +-------------------+
+                               | MakefileGenerator |
+                               +-------------------+
+                                 ^            ^
+                                 |            |
+                                 |            X <-- Avoid this inheritance
+                                 |            |
+              +------------------------+  +------------------------+
+              | UnixMakefileGenerator  |  | SymbianCommonGenerator |
+              |         or             |  |                        |
+              | NmakeMakefileGenerator |  |                        |
+              +------------------------+  +------------------------+
+                                 ^            ^
+                                 |            |
+                                 |            |
+                                 |            |
+                           +-----------------------------+
+                           | SymbianMakefileTemplate<>   |
+                           +-----------------------------+
+
+       We want to avoid the famous diamond problem, because if we have that, we need
+       virtual inheritance, which not all compilers like. Therefore, we break the
+       link as illustrated. Instead, we have a pointer to MakefileGenerator inside
+       SymbianCommonGenerator, and allows full access by making it a friend here.
+    */
+    friend class SymbianCommonGenerator;
 };
 

trunk/qmake/generators/makefiledeps.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/generators/makefiledeps.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/generators/metamakefile.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -58 +58 @@
         delete project;
 }
+
+#ifndef QT_QMAKE_PARSER_ONLY
 
 class BuildsMetaMakefileGenerator : public MetaMakefileGenerator
@@ -294 +296 @@
     bool hasError = false;
 
-    if(Option::recursive) {
+    // It might make sense to bequeath the CONFIG option to the recursed
+    // projects. OTOH, one would most likely have it in all projects anyway -
+    // either through a qmakespec, a .qmake.cache or explicitly - as otherwise
+    // running qmake in a subdirectory would have a different auto-recurse
+    // setting than in parent directories.
+    bool recurse = Option::recursive == Option::QMAKE_RECURSIVE_YES
+                   || (Option::recursive == Option::QMAKE_RECURSIVE_DEFAULT
+                       && project->isRecursive());
+    if(recurse) {
         QString old_output_dir = Option::output_dir;
         QString old_output = Option::output.fileName();
@@ -376 +386 @@
     self->input_dir = qmake_getpwd();
     self->output_dir = Option::output_dir;
-    if(!Option::recursive || (!Option::output.fileName().endsWith(Option::dir_sep) && !QFileInfo(Option::output).isDir()))
+    if(!recurse || (!Option::output.fileName().endsWith(Option::dir_sep) && !QFileInfo(Option::output).isDir()))
         self->output_file = Option::output.fileName();
     self->makefile = new BuildsMetaMakefileGenerator(project, name, false);
@@ -434 +444 @@
 #include "msvc_nmake.h"
 #include "borland_bmake.h"
-#include "msvc_dsp.h"
 #include "msvc_vcproj.h"
+#include "msvc_vcxproj.h"
 #include "symmake_abld.h"
 #include "symmake_sbsv2.h"
+#include "symbian_makefile.h"
 QT_END_INCLUDE_NAMESPACE
 
@@ -462 +473 @@
     } else if(gen == "PROJECTBUILDER" || gen == "XCODE") {
         mkfile = new ProjectBuilderMakefileGenerator;
-    } else if(gen == "MSVC") {
-        // Visual Studio =< v6.0
-        if(proj->first("TEMPLATE").indexOf(QRegExp("^vc.*")) != -1)
-            mkfile = new DspMakefileGenerator;
+    } else if(gen == "MSVC.NET") {
+        if (proj->first("TEMPLATE").startsWith("vc"))
+            mkfile = new VcprojGenerator;
         else
             mkfile = new NmakeMakefileGenerator;
-    } else if(gen == "MSVC.NET") {
-        // Visual Studio >= v7.0
-        if(proj->first("TEMPLATE").indexOf(QRegExp("^vc.*")) != -1 || proj->first("TEMPLATE").indexOf(QRegExp("^ce.*")) != -1)
-            mkfile = new VcprojGenerator;
+    } else if(gen == "MSBUILD") {
+        // Visual Studio >= v11.0
+        if (proj->first("TEMPLATE").startsWith("vc"))
+            mkfile = new VcxprojGenerator;
         else
             mkfile = new NmakeMakefileGenerator;
@@ -480 +490 @@
     } else if(gen == "SYMBIAN_SBSV2") {
         mkfile = new SymbianSbsv2MakefileGenerator;
+    } else if(gen == "SYMBIAN_UNIX") {
+        mkfile = new SymbianMakefileTemplate<UnixMakefileGenerator>;
     } else {
         fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());
@@ -507 +519 @@
 }
 
+#endif // QT_QMAKE_PARSER_ONLY
+
+bool
+MetaMakefileGenerator::modesForGenerator(const QString &gen,
+        Option::HOST_MODE *host_mode, Option::TARG_MODE *target_mode)
+{
+    if (gen == "UNIX") {
+#ifdef Q_OS_MAC
+        *host_mode = Option::HOST_MACX_MODE;
+        *target_mode = Option::TARG_MACX_MODE;
+#else
+        *host_mode = Option::HOST_UNIX_MODE;
+        *target_mode = Option::TARG_UNIX_MODE;
+#endif
+    } else if (gen == "MSVC.NET" || gen == "BMAKE" || gen == "MSBUILD") {
+        *host_mode = Option::HOST_WIN_MODE;
+        *target_mode = Option::TARG_WIN_MODE;
+    } else if (gen == "MINGW") {
+#if defined(Q_OS_MAC)
+        *host_mode = Option::HOST_MACX_MODE;
+#elif defined(Q_OS_UNIX)
+        *host_mode = Option::HOST_UNIX_MODE;
+#else
+        *host_mode = Option::HOST_WIN_MODE;
+#endif
+        *target_mode = Option::TARG_WIN_MODE;
+    } else if (gen == "PROJECTBUILDER" || gen == "XCODE") {
+        *host_mode = Option::HOST_MACX_MODE;
+        *target_mode = Option::TARG_MACX_MODE;
+    } else if (gen == "SYMBIAN_ABLD" || gen == "SYMBIAN_SBSV2" || gen == "SYMBIAN_UNIX") {
+#if defined(Q_OS_MAC)
+        *host_mode = Option::HOST_MACX_MODE;
+#elif defined(Q_OS_UNIX)
+        *host_mode = Option::HOST_UNIX_MODE;
+#else
+        *host_mode = Option::HOST_WIN_MODE;
+#endif
+        *target_mode = Option::TARG_SYMBIAN_MODE;
+    } else {
+        fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());
+        return false;
+    }
+    return true;
+}
+
 QT_END_NAMESPACE

trunk/qmake/generators/metamakefile.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -43 +43 @@
 #define METAMAKEFILE_H
 
+#include <option.h>
+
 #include <qlist.h>
 #include <qstring.h>
@@ -66 +68 @@
     static MakefileGenerator *createMakefileGenerator(QMakeProject *proj, bool noIO = false);
 
+    static bool modesForGenerator(const QString &generator,
+                                  Option::HOST_MODE *host_mode, Option::TARG_MODE *target_mode);
+
     inline QMakeProject *projectFile() const { return project; }
 

trunk/qmake/generators/projectgenerator.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -112 +112 @@
                     if(dir.right(1) != Option::dir_sep)
                         dir += Option::dir_sep;
-                    if(Option::recursive) {
+                    if(Option::recursive == Option::QMAKE_RECURSIVE_YES) {
                         QStringList files = QDir(dir).entryList(QDir::Files);
                         for(int i = 0; i < (int)files.count(); i++) {
@@ -139 +139 @@
                     regex = regex.right(regex.length() - (s+1));
                 }
-                if(Option::recursive) {
+                if(Option::recursive == Option::QMAKE_RECURSIVE_YES) {
                     QStringList entries = QDir(dir).entryList(QDir::Dirs);
                     for(int i = 0; i < (int)entries.count(); i++) {
@@ -194 +194 @@
                         }
                     }
-                    if(Option::recursive) {
+                    if(Option::recursive == Option::QMAKE_RECURSIVE_YES) {
                         QStringList dirs = QDir(newdir).entryList(QDir::Dirs);
                         for(int i = 0; i < (int)dirs.count(); i++) {
@@ -231 +231 @@
                             }
                         }
-                        if(Option::recursive && !knownDirs.contains(newdir, Qt::CaseInsensitive))
+                        if(Option::recursive == Option::QMAKE_RECURSIVE_YES
+                           && !knownDirs.contains(newdir, Qt::CaseInsensitive))
                             knownDirs.append(newdir);
                     }

trunk/qmake/generators/projectgenerator.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/generators/symbian/initprojectdeploy_symbian.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -48 +48 @@
 
 // Included from tools/shared
-#include <symbian/epocroot.h>
+#include <symbian/epocroot_p.h>
 
 #define SYSBIN_DIR "/sys/bin"
+#define HW_Z_DIR "epoc32/data/z"
 
 #define SUFFIX_DLL "dll"
@@ -59 +60 @@
 {
     QString ret = Option::fixPathToTargetOS(src);
-    return ret.replace('/', '\\');
+
+    bool pathHasDriveLetter = false;
+    if (ret.size() > 1)
+        pathHasDriveLetter = (ret.at(1) == QLatin1Char(':'));
+
+    return pathHasDriveLetter ? ret.replace('/', '\\') : QDir::toNativeSeparators(ret);
 }
 
@@ -66 +72 @@
     // Libraries are plugins if deployment path is something else than
     // SYSBIN_DIR with or without drive letter
-    if (0 == info.suffix().compare(QLatin1String(SUFFIX_DLL), Qt::CaseInsensitive) &&
-            (devicePath.size() < 8 ||
-             (0 != devicePath.compare(QLatin1String(SYSBIN_DIR), Qt::CaseInsensitive) &&
-              0 != devicePath.mid(1).compare(QLatin1String(":" SYSBIN_DIR), Qt::CaseInsensitive)))) {
+    if (0 == info.suffix().compare(QLatin1String(SUFFIX_DLL), Qt::CaseInsensitive)
+            && (devicePath.size() < 8
+             || (0 != devicePath.compare(QLatin1String(SYSBIN_DIR), Qt::CaseInsensitive)
+                && 0 != devicePath.mid(1).compare(QLatin1String(":" SYSBIN_DIR), Qt::CaseInsensitive)
+                && 0 != devicePath.compare(qt_epocRoot() + QLatin1String(HW_Z_DIR SYSBIN_DIR))))) {
         return true;
     } else {
@@ -92 +99 @@
                              QStringList& generatedFiles)
 {
-    QDir().mkpath(QLatin1String(PLUGIN_STUB_DIR));
-    if (!generatedDirs.contains(PLUGIN_STUB_DIR))
-        generatedDirs << PLUGIN_STUB_DIR;
+    QString pluginStubDir = Option::output_dir + QLatin1Char('/') + QLatin1String(PLUGIN_STUB_DIR);
+    QDir().mkpath(pluginStubDir);
+    if (!generatedDirs.contains(pluginStubDir))
+        generatedDirs << pluginStubDir;
     // Plugin stubs must have different name from the actual plugins, because
     // the toolchain for creating ROM images cannot handle non-binary .dll files properly.
-    QFile stubFile(QLatin1String(PLUGIN_STUB_DIR "/") + info.completeBaseName() + "." SUFFIX_QTPLUGIN);
+    QFile stubFile(pluginStubDir + QLatin1Char('/') + info.completeBaseName() + QLatin1Char('.') + QLatin1String(SUFFIX_QTPLUGIN));
     if (stubFile.open(QIODevice::WriteOnly)) {
         if (!generatedFiles.contains(stubFile.fileName()))
@@ -156 +164 @@
                               const QString &testPath,
                               bool deployBinaries,
+                              bool epocBuild,
                               const QString &platform,
                               const QString &build,
@@ -171 +180 @@
         targetPathHasDriveLetter = targetPath.at(1) == QLatin1Char(':');
     }
-    QString deploymentDrive = targetPathHasDriveLetter ? targetPath.left(2) : QLatin1String("c:");
+
+    QString deploymentDrive;
+    if (0 == platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))) {
+        deploymentDrive = qt_epocRoot() + HW_Z_DIR;
+    } else {
+        deploymentDrive = targetPathHasDriveLetter ? targetPath.left(2) : QLatin1String("c:");
+    }
 
     foreach(QString item, project->values("DEPLOYMENT")) {
@@ -189 +204 @@
         }
         if (!deployBinaries
+                && 0 != platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))
                 && !devicePathWithoutDrive.isEmpty()
                 && (0 == devicePathWithoutDrive.compare(project->values("APP_RESOURCE_DIR").join(""), Qt::CaseInsensitive)
@@ -208 +224 @@
             devicePath = Option::fixPathToLocalOS(QDir::cleanPath(targetPath + QLatin1Char('/') + devicePath));
         } else {
-            if (!platform.compare(QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM))) {
+            if (0 == platform.compare(QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM))) {
                 if (devicePathHasDriveLetter) {
-                    devicePath = epocRoot() + "epoc32/winscw/" + devicePath.remove(1, 1);
+                    devicePath = qt_epocRoot() + "epoc32/winscw/" + devicePath.remove(1, 1);
                 } else {
-                    devicePath = epocRoot() + "epoc32/winscw/c" + devicePath;
+                    devicePath = qt_epocRoot() + "epoc32/winscw/c" + devicePath;
                 }
             } else {
-                if (!devicePathHasDriveLetter) {
-                    if (!platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))) {
-                        //For plugin deployment under ARM no needed drive letter
-                        devicePath = epocRoot() + "epoc32/data/z" + devicePath;
-                    } else if (targetPathHasDriveLetter) {
-                        // Drive letter needed if targetpath contains one and it is not already in
-                        devicePath = deploymentDrive + devicePath;
-                    }
-                } else {
-                    //it is necessary to delete drive letter for ARM deployment
-                    if (!platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))) {
-                        devicePath.remove(0,2);
-                        devicePath = epocRoot() + "epoc32/data/z" + devicePath;
-                    }
+                if (devicePathHasDriveLetter
+                    && 0 == platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))) {
+                    devicePath.remove(0,2);
+                }
+                if (0 == platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))
+                    || (!devicePathHasDriveLetter && targetPathHasDriveLetter)) {
+                    devicePath = deploymentDrive + devicePath;
                 }
             }
@@ -235 +244 @@
         devicePath.replace(QLatin1String("\\"), QLatin1String("/"));
 
-        if (!deployBinaries &&
-                0 == devicePath.right(8).compare(QLatin1String(SYSBIN_DIR), Qt::CaseInsensitive)) {
+        if (!deployBinaries
+                && 0 == devicePath.right(8).compare(QLatin1String(SYSBIN_DIR), Qt::CaseInsensitive)
+                && 0 != platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))) {
             // Skip deploying to SYSBIN_DIR for anything but binary deployments
             // Note: Deploying pre-built binaries also follow this rule, so emulator builds
@@ -243 +253 @@
             continue;
         }
+
+        QStringList flags = project->values(item + ".flags");
 
         foreach(QString source, project->values(item + ".sources")) {
@@ -265 +277 @@
                         if (deployBinaries) {
                             // Executables and libraries are deployed to \sys\bin
-                            QFileInfo targetPath(epocRoot() + "epoc32/release/" + platform + "/" + build + "/");
+                            QFileInfo targetPath;
+                            if (epocBuild)
+                                targetPath.setFile(qt_epocRoot() + "epoc32/release/" + platform + "/" + build + "/");
+                            else
+                                targetPath.setFile(info.path() + QDir::separator());
                             if(devicePathHasDriveLetter) {
                                 deploymentList.append(CopyItem(
@@ -271 +287 @@
                                     false, true),
                                     fixPathToEpocOS(devicePath.left(2) + QLatin1String(SYSBIN_DIR "/")
-                                    + info.fileName())));
+                                    + info.fileName()),
+                                    flags));
                             } else {
                                 deploymentList.append(CopyItem(
                                     Option::fixPathToLocalOS(targetPath.absolutePath() + "/" + info.fileName(),
                                     false, true),
-                                    fixPathToEpocOS(deploymentDrive + QLatin1String(SYSBIN_DIR "/")
-                                    + info.fileName())));
+                                    fixPathToEpocOS(deploymentDrive + QLatin1String("/" SYSBIN_DIR "/")
+                                    + info.fileName()),
+                                    flags));
                             }
                         }
@@ -288 +306 @@
                         // when generating .pkg files.
                         deploymentList.append(CopyItem(Option::fixPathToLocalOS(info.absoluteFilePath()),
-                                                       fixPathToEpocOS(devicePath + "/" + info.fileName())));
+                                                       fixPathToEpocOS(devicePath + "/" + info.fileName()),
+                                                       flags));
                         continue;
                     }
@@ -309 +328 @@
                         // This deploys pre-built plugins. Other pre-built binaries will deploy normally,
                         // as they have SYSBIN_DIR target path.
-                        if (deployBinaries) {
+                        if (deployBinaries
+                            || (0 == platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM)))) {
                             if (devicePathHasDriveLetter) {
                                 deploymentList.append(CopyItem(
                                     Option::fixPathToLocalOS(absoluteItemPath + "/" + iterator.fileName()),
                                     fixPathToEpocOS(devicePath.left(2) + QLatin1String(SYSBIN_DIR "/")
-                                    + iterator.fileName())));
+                                    + iterator.fileName()),
+                                    flags));
                             } else {
                                 deploymentList.append(CopyItem(
                                     Option::fixPathToLocalOS(absoluteItemPath + "/" + iterator.fileName()),
-                                    fixPathToEpocOS(deploymentDrive + QLatin1String(SYSBIN_DIR "/")
-                                    + iterator.fileName())));
+                                    fixPathToEpocOS(deploymentDrive + QLatin1String("/" SYSBIN_DIR "/")
+                                    + iterator.fileName()),
+                                    flags));
                             }
                         }
@@ -329 +351 @@
                             Option::fixPathToLocalOS(absoluteItemPath + "/" + iterator.fileName()),
                             fixPathToEpocOS(devicePath + "/" + absoluteItemPath.right(diffSize)
-                            + "/" + iterator.fileName())));
+                            + "/" + iterator.fileName()),
+                            flags));
                     }
                 }
@@ -335 +358 @@
         }
     }
-}
+
+    // Remove deployments that do not actually do anything
+    if (0 == platform.compare(QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM))
+        || 0 == platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))) {
+        QMutableListIterator<CopyItem> i(deploymentList);
+        while(i.hasNext()) {
+            CopyItem &item = i.next();
+            QFileInfo fromItem(item.from);
+            QFileInfo toItem(item.to);
+#if defined(Q_OS_WIN)
+            if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath(), Qt::CaseInsensitive))
+#else
+            if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath()))
+#endif
+                i.remove();
+        }
+    }
+}

trunk/qmake/generators/symbian/initprojectdeploy_symbian.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -57 +57 @@
 struct CopyItem
 {
-    CopyItem(const QString& f, const QString& t) : from(f) , to(t) { }
+    CopyItem(const QString& f, const QString& t)
+        : from(f) , to(t) { }
+    CopyItem(const QString& f, const QString& t, const QStringList& l)
+        : from(f) , to(t), flags(l) { }
     QString from;
     QString to;
+    QStringList flags;
 };
 typedef QList<CopyItem> DeploymentList;
@@ -70 +74 @@
                               const QString &testPath,
                               bool deployBinaries,
+                              bool epocBuild,
                               const QString &platform,
                               const QString &build,

trunk/qmake/generators/symbian/symmake.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -51 +51 @@
 
 // Included from tools/shared
-#include <symbian/epocroot.h>
+#include <symbian/epocroot_p.h>
 
 #define RESOURCE_DIRECTORY_MMP "/resource/apps"
-#define RESOURCE_DIRECTORY_RESOURCE "\\\\resource\\\\apps\\\\"
 #define REGISTRATION_RESOURCE_DIRECTORY_HW "/private/10003a3f/import/apps"
 #define PLUGIN_COMMON_DEF_FILE_FOR_MMP "./plugin_common.def"
-#define PLUGIN_COMMON_DEF_FILE_ACTUAL "plugin_commonU.def"
+#define BLD_INF_FILENAME_LEN (sizeof(BLD_INF_FILENAME) - 1)
 
 #define BLD_INF_RULES_BASE "BLD_INF_RULES."
@@ -65 +64 @@
 #define BLD_INF_TAG_EXTENSIONS "prj_extensions"
 #define BLD_INF_TAG_TESTEXTENSIONS "prj_testextensions"
-
-#define RSS_RULES "RSS_RULES"
-#define RSS_RULES_BASE "RSS_RULES."
-#define RSS_TAG_NBROFICONS "number_of_icons"
-#define RSS_TAG_ICONFILE "icon_file"
-#define RSS_TAG_HEADER "header"
-#define RSS_TAG_SERVICE_LIST "service_list"
-#define RSS_TAG_FILE_OWNERSHIP_LIST "file_ownership_list"
-#define RSS_TAG_DATATYPE_LIST "datatype_list"
-#define RSS_TAG_FOOTER "footer"
-#define RSS_TAG_DEFAULT "default_rules" // Same as just giving rules without tag
 
 #define MMP_TARGET "TARGET"
@@ -96 +84 @@
 #define VAR_LFLAGS "QMAKE_LFLAGS"
 
-#define SIS_TARGET "sis"
-#define INSTALLER_SIS_TARGET "installer_sis"
-#define ROM_STUB_SIS_TARGET "stub_sis"
-#define OK_SIS_TARGET "ok_sis"
-#define OK_INSTALLER_SIS_TARGET "ok_installer_sis"
-#define OK_ROM_STUB_SIS_TARGET "ok_stub_sis"
-#define FAIL_SIS_NOPKG_TARGET "fail_sis_nopkg"
-#define FAIL_SIS_NOCACHE_TARGET "fail_sis_nocache"
-
-#define PRINT_FILE_CREATE_ERROR(filename) fprintf(stderr, "Error: Could not create '%s'\n", qPrintable(filename));
-
-#define MANUFACTURER_NOTE_FILE "manufacturer_note.txt"
-#define DEFAULT_MANUFACTURER_NOTE \
-    "The package is not supported for devices from this manufacturer. Please try the selfsigned " \
-    "version of the package instead."
+#define DEFINE_REPLACE_REGEXP "[^A-Z0-9_]"
 
 QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const QDir& parentDir)
@@ -116 +90 @@
     static QString epocRootStr;
     if (epocRootStr.isEmpty()) {
-        epocRootStr = epocRoot();
+        epocRootStr = qt_epocRoot();
         QFileInfo efi(epocRootStr);
         if (!efi.exists() || epocRootStr.isEmpty()) {
-            fprintf(stderr, "Unable to resolve epocRoot '%s' to real dir on current drive, defaulting to '/' for mmp paths\n", qPrintable(epocRoot()));
+            fprintf(stderr, "Unable to resolve epocRoot '%s' to real dir on current drive, defaulting to '/' for mmp paths\n", qPrintable(qt_epocRoot()));
             epocRootStr = "/";
         } else {
@@ -151 +125 @@
     QString resultPath = QDir::fromNativeSeparators(origPath);
     if (resultPath.startsWith("/epoc32/", Qt::CaseInsensitive))
-        resultPath = QDir::fromNativeSeparators(epocRoot()) + resultPath.mid(1);
+        resultPath = QDir::fromNativeSeparators(qt_epocRoot()) + resultPath.mid(1);
 
     QFileInfo fi(fileInfo(resultPath));
@@ -169 +143 @@
 }
 
-SymbianMakefileGenerator::SymbianMakefileGenerator() : MakefileGenerator() { }
+SymbianMakefileGenerator::SymbianMakefileGenerator() : MakefileGenerator(), SymbianCommonGenerator(this) { }
 SymbianMakefileGenerator::~SymbianMakefileGenerator() { }
 
@@ -194 +168 @@
     bldinfDefine.append("_");
     bldinfDefine.append(generate_uid(project->projectFile()));
+    bldinfDefine = bldinfDefine.toUpper();
+
+    // replace anything not alphanumeric with underscore
+    QRegExp replacementMask(DEFINE_REPLACE_REGEXP);
+    bldinfDefine.replace(replacementMask, QLatin1String("_"));
 
     bldinfDefine.prepend("BLD_INF_");
-    removeSpecialCharacters(bldinfDefine);
-
-    t << "#define " << bldinfDefine.toUpper() << endl << endl;
+
+    t << "#define " << bldinfDefine << endl << endl;
 }
 
 bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
 {
+    if(!project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty()) {
+        fprintf(stderr, "Project files not generated because all requirements are not met:\n\t%s\n",
+                qPrintable(var("QMAKE_FAILED_REQUIREMENTS")));
+        return false;
+    }
+
     writeHeader(t);
 
@@ -210 +194 @@
     readRssRules(numberOfIcons, iconFile, userRssRules);
 
-    // Get the application translations and convert to symbian OS lang code, i.e. decical number
-    QStringList symbianLangCodes = symbianLangCodesFromTsFiles();
+    SymbianLocalizationList symbianLocalizationList;
+    parseTsFiles(&symbianLocalizationList);
 
     // Generate pkg files if there are any actual files to deploy
     bool generatePkg = false;
-    DeploymentList depList;
 
     if (targetType == TypeExe) {
@@ -229 +212 @@
 
     if (generatePkg) {
-        generatePkgFile(iconFile, depList);
-    }
-
-    writeBldInfContent(t, generatePkg, iconFile, depList);
+        generatePkgFile(iconFile, true, symbianLocalizationList);
+    }
+
+    writeBldInfContent(t, generatePkg, iconFile);
 
     // Generate empty wrapper makefile here, because wrapper makefile must exist before writeMkFile,
     // but all required data is not yet available.
     bool isPrimaryMakefile = true;
-    QString wrapperFileName("Makefile");
+    QString wrapperFileName = Option::output_dir + QLatin1Char('/') + QLatin1String("Makefile");
     QString outputFileName = fileInfo(Option::output.fileName()).fileName();
     if (outputFileName != BLD_INF_FILENAME) {
@@ -265 +248 @@
     writeMkFile(wrapperFileName, false);
 
-    QString shortProFilename = project->projectFile();
-    shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
-    shortProFilename.replace(Option::pro_ext, QString(""));
-
-    QString mmpFilename = shortProFilename;
-    mmpFilename.append("_");
-    mmpFilename.append(uid3);
-    mmpFilename.append(Option::mmp_ext);
-    writeMmpFile(mmpFilename, symbianLangCodes);
+    QString absoluteMmpFileName = Option::output_dir + QLatin1Char('/') + mmpFileName;
+    writeMmpFile(absoluteMmpFileName, symbianLocalizationList);
 
     if (targetType == TypeExe) {
@@ -279 +255 @@
             writeRegRssFile(userRssRules);
             writeRssFile(numberOfIcons, iconFile);
-            writeLocFile(symbianLangCodes);
+            writeLocFile(symbianLocalizationList);
         }
     }
@@ -289 +265 @@
 }
 
-void SymbianMakefileGenerator::generatePkgFile(const QString &iconFile, DeploymentList &depList)
-{
-    QString pkgFilename = QString("%1_template.%2")
-                          .arg(fixedTarget)
-                          .arg("pkg");
-    QFile pkgFile(pkgFilename);
-    if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        PRINT_FILE_CREATE_ERROR(pkgFilename);
-        return;
-    }
-
-    generatedFiles << pkgFile.fileName();
-    QTextStream t(&pkgFile);
-
-    QString installerSisHeader = project->values("DEPLOYMENT.installer_header").join("\n");
-    if (installerSisHeader.isEmpty())
-        installerSisHeader = "0xA000D7CE"; // Use default self-signable UID if not defined
-
-    QString wrapperStreamBuffer;
-    QTextStream tw(&wrapperStreamBuffer);
-
-    QString dateStr = QDateTime::currentDateTime().toString(Qt::ISODate);
-
-    // Header info
-    QString wrapperPkgFilename = QString("%1_installer.%2")
-                                .arg(fixedTarget)
-                                .arg("pkg");
-    QString headerComment = "; %1 generated by qmake at %2\n"
-        "; This file is generated by qmake and should not be modified by the user\n"
-        ";\n\n";
-    t << headerComment.arg(pkgFilename).arg(dateStr);
-    tw << headerComment.arg(wrapperPkgFilename).arg(dateStr);
-
-    // Construct QStringList from pkg_prerules since we need search it before printed to file
-    // Note: Though there can't be more than one language or header line, use stringlists
-    // in case user wants comments to go with the rules.
-    QStringList rawPkgPreRules;
-    QStringList languageRules;
-    QStringList headerRules;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
-        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_prerules")) {
-            QStringList pkgrulesValue = project->values(pkgrulesItem);
-            // If there is no stringlist defined for a rule, use rule name directly
-            // This is convenience for defining single line mmp statements
-            if (pkgrulesValue.isEmpty()) {
-                if (pkgrulesItem.startsWith("&"))
-                    languageRules << pkgrulesItem;
-                else if (pkgrulesItem.startsWith("#"))
-                    headerRules << pkgrulesItem;
-                else
-                    rawPkgPreRules << pkgrulesItem;
-            } else {
-                if (containsStartWithItem('&', pkgrulesValue)) {
-                    foreach(QString pkgrule, pkgrulesValue) {
-                        languageRules << pkgrule;
-                    }
-                } else if (containsStartWithItem('#', pkgrulesValue)) {
-                    foreach(QString pkgrule, pkgrulesValue) {
-                        headerRules << pkgrule;
-                    }
-                } else {
-                    foreach(QString pkgrule, pkgrulesValue) {
-                        rawPkgPreRules << pkgrule;
-                    }
-                }
-            }
-        }
-    }
-
-    // Apply some defaults if specific data does not exist in PKG pre-rules
-
-    if (languageRules.isEmpty()) {
-        // language, (*** hardcoded to english atm, should be parsed from TRANSLATIONS)
-        languageRules << "; Language\n&EN\n\n";
-    } else if (headerRules.isEmpty()) {
-        // In case user defines langs, he must take care also about SIS header
-        fprintf(stderr, "Warning: If language is defined with DEPLOYMENT pkg_prerules, also the SIS header must be defined\n");
-    }
-
-    t << languageRules.join("\n") << endl;
-    tw << languageRules.join("\n") << endl;
-
-    // name of application, UID and version
-    QString applicationVersion = project->first("VERSION").isEmpty() ? "1,0,0" : project->first("VERSION").replace('.', ',');
-    QString sisHeader = "; SIS header: name, uid, version\n#{\"%1\"},(%2),%3\n\n";
-    QString visualTarget = escapeFilePath(fileFixify(project->first("TARGET")));
-    visualTarget = removePathSeparators(visualTarget);
-    QString wrapperTarget = visualTarget + " installer";
-
-    if (installerSisHeader.startsWith("0x", Qt::CaseInsensitive)) {
-        tw << sisHeader.arg(wrapperTarget).arg(installerSisHeader).arg(applicationVersion);
-    } else {
-        tw << installerSisHeader << endl;
-    }
-
-    if (headerRules.isEmpty())
-        t << sisHeader.arg(visualTarget).arg(uid3).arg(applicationVersion);
-    else
-        t << headerRules.join("\n") << endl;
-
-    // Localized vendor name
-    QString vendorName;
-    if (!containsStartWithItem('%', rawPkgPreRules)) {
-        vendorName += "; Localised Vendor name\n%{\"Vendor\"}\n\n";
-    }
-
-    // Unique vendor name
-    if (!containsStartWithItem(':', rawPkgPreRules)) {
-        vendorName += "; Unique Vendor name\n:\"Vendor\"\n\n";
-    }
-
-    t << vendorName;
-    tw << vendorName;
-
-    // PKG pre-rules - these are added before actual file installations i.e. SIS package body
-    if (rawPkgPreRules.size()) {
-        QString comment = "\n; Manual PKG pre-rules from PRO files\n";
-        t << comment;
-        tw << comment;
-
-        foreach(QString item, rawPkgPreRules) {
-            // Only regular pkg file should have package dependencies or pkg header if that is
-            // defined using prerules.
-            if (!item.startsWith("(") && !item.startsWith("#")) {
-                tw << item << endl;
-            }
-            t << item << endl;
-        }
-        t << endl;
-        tw << endl;
-    }
-
-    // Begin Manufacturer block
-    if (!project->values("DEPLOYMENT.manufacturers").isEmpty()) {
-        QString manufacturerStr("IF ");
-        foreach(QString manufacturer, project->values("DEPLOYMENT.manufacturers")) {
-            manufacturerStr.append(QString("(MANUFACTURER)=(%1) OR \n   ").arg(manufacturer));
-        }
-        // Remove the final OR
-        manufacturerStr.chop(8);
-        t << manufacturerStr << endl;
-    }
-
-    // Install paths on the phone *** should be dynamic at some point
-    QString installPathBin = "!:\\sys\\bin";
-    QString installPathResource = "!:\\resource\\apps";
-    QString installPathRegResource = "!:\\private\\10003a3f\\import\\apps";
-
-    // Find location of builds
-    QString epocReleasePath = QString("%1epoc32/release/$(PLATFORM)/$(TARGET)")
-                              .arg(epocRoot());
-
-    if (targetType == TypeExe) {
-        // deploy .exe file
-        t << "; Executable and default resource files" << endl;
-        QString exeFile = fixedTarget + ".exe";
-        t << QString("\"%1/%2\"    - \"%3\\%4\"")
-             .arg(epocReleasePath)
-             .arg(exeFile)
-             .arg(installPathBin)
-             .arg(exeFile) << endl;
-
-        // deploy rsc & reg_rsc file
-        if (!project->isActiveConfig("no_icon")) {
-            t << QString("\"%1epoc32/data/z/resource/apps/%2\"    - \"%3\\%4\"")
-                 .arg(epocRoot())
-                 .arg(fixedTarget + ".rsc")
-                 .arg(installPathResource)
-                 .arg(fixedTarget + ".rsc") << endl;
-
-            t << QString("\"%1epoc32/data/z/private/10003a3f/import/apps/%2\"    - \"%3\\%4\"")
-                 .arg(epocRoot())
-                 .arg(fixedTarget + "_reg.rsc")
-                 .arg(installPathRegResource)
-                 .arg(fixedTarget + "_reg.rsc") << endl;
-
-            if (!iconFile.isEmpty())  {
-                t << QString("\"%1epoc32/data/z%2\"    - \"!:%3\"")
-                     .arg(epocRoot())
-                     .arg(iconFile)
-                     .arg(QDir::toNativeSeparators(iconFile)) << endl << endl;
-            }
-        }
-    }
-
-    // deploy any additional DEPLOYMENT  files
-    QString remoteTestPath;
-    remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
-    QString zDir = epocRoot() + QLatin1String("epoc32/data/z");
-
-    initProjectDeploySymbian(project, depList, remoteTestPath, true, "$(PLATFORM)", "$(TARGET)", generatedDirs, generatedFiles);
-    if (depList.size())
-        t << "; DEPLOYMENT" << endl;
-    for (int i = 0; i < depList.size(); ++i)  {
-        QString from = depList.at(i).from;
-        QString to = depList.at(i).to;
-
-        // Deploy anything not already deployed from under epoc32 instead from under
-        // \epoc32\data\z\ to enable using pkg file without rebuilding
-        // the project, which can be useful for some binary only distributions.
-        if (!from.contains(QLatin1String("epoc32"), Qt::CaseInsensitive)) {
-            from = to;
-            if (from.size() > 1 && from.at(1) == QLatin1Char(':'))
-                from = from.mid(2);
-            from.prepend(zDir);
-        } else {
-            if (from.size() > 1 && from.at(1) == QLatin1Char(':'))
-                from = from.mid(2);
-        }
-
-        t << QString("\"%1\"    - \"%2\"").arg(from.replace('\\','/')).arg(to) << endl;
-    }
-    t << endl;
-
-    // PKG post-rules - these are added after actual file installations i.e. SIS package body
-    t << "; Manual PKG post-rules from PRO files" << endl;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
-        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_postrules")) {
-            QStringList pkgrulesValue = project->values(pkgrulesItem);
-            // If there is no stringlist defined for a rule, use rule name directly
-            // This is convenience for defining single line statements
-            if (pkgrulesValue.isEmpty()) {
-                t << pkgrulesItem << endl;
-            } else {
-                foreach(QString pkgrule, pkgrulesValue) {
-                    t << pkgrule << endl;
-                }
-            }
-            t << endl;
-        }
-    }
-
-    // Close Manufacturer block
-    if (!project->values("DEPLOYMENT.manufacturers").isEmpty()) {
-        QString manufacturerFailNoteFile;
-        if (project->values("DEPLOYMENT.manufacturers.fail_note").isEmpty()) {
-            manufacturerFailNoteFile = QString("%1_" MANUFACTURER_NOTE_FILE).arg(uid3);
-            QFile ft(manufacturerFailNoteFile);
-            if (ft.open(QIODevice::WriteOnly)) {
-                generatedFiles << ft.fileName();
-                QTextStream t2(&ft);
-
-                t2 << QString(DEFAULT_MANUFACTURER_NOTE) << endl;
-            } else {
-                PRINT_FILE_CREATE_ERROR(manufacturerFailNoteFile)
-            }
-        } else {
-            manufacturerFailNoteFile = project->values("DEPLOYMENT.manufacturers.fail_note").join("");
-        }
-
-        t << "ELSEIF NOT(0) ; MANUFACTURER" << endl
-          << "\"" << fileInfo(manufacturerFailNoteFile).absoluteFilePath() << "\""
-          << " - \"\", FILETEXT, TEXTEXIT" << endl
-          << "ENDIF ; MANUFACTURER" << endl;
-    }
-
-    // Write wrapper pkg
-    if (!installerSisHeader.isEmpty()) {
-        QFile wrapperPkgFile(wrapperPkgFilename);
-        if (!wrapperPkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-            PRINT_FILE_CREATE_ERROR(wrapperPkgFilename);
-            return;
-        }
-
-        generatedFiles << wrapperPkgFile.fileName();
-        QTextStream twf(&wrapperPkgFile);
-
-        twf << wrapperStreamBuffer << endl;
-
-        // Wrapped files deployment
-        QString currentPath = qmake_getpwd();
-        QString sisName = QString("%1.sis").arg(fixedTarget);
-        twf << "\"" << currentPath << "/" << sisName << "\" - \"c:\\adm\\" << sisName << "\"" << endl;
-
-        QString bootStrapPath = QLibraryInfo::location(QLibraryInfo::PrefixPath);
-        bootStrapPath.append("/smartinstaller.sis");
-        QFileInfo fi(fileInfo(bootStrapPath));
-        twf << "@\"" << fi.absoluteFilePath() << "\",(0x2002CCCD)" << endl;
-    }
-}
-
-bool SymbianMakefileGenerator::containsStartWithItem(const QChar &c, const QStringList& src)
-{
-    bool result = false;
-    foreach(QString str, src) {
-        if (str.startsWith(c)) {
-            result =  true;
-            break;
-        }
-    }
-    return result;
-}
-
-void SymbianMakefileGenerator::writeCustomDefFile()
-{
-    if (targetType == TypePlugin && !project->isActiveConfig("stdbinary")) {
-        // Create custom def file for plugin
-        QFile ft(QLatin1String(PLUGIN_COMMON_DEF_FILE_ACTUAL));
-
-        if (ft.open(QIODevice::WriteOnly)) {
-            generatedFiles << ft.fileName();
-            QTextStream t(&ft);
-
-            t << "; ==============================================================================" << endl;
-            t << "; Generated by qmake (" << qmake_version() << ") (Qt " QT_VERSION_STR ") on: ";
-            t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-            t << "; This file is generated by qmake and should not be modified by the" << endl;
-            t << "; user." << endl;
-            t << ";  Name        : " PLUGIN_COMMON_DEF_FILE_ACTUAL << endl;
-            t << ";  Part of     : " << project->values("TARGET").join(" ") << endl;
-            t << ";  Description : Fixes common plugin symbols to known ordinals" << endl;
-            t << ";  Version     : " << endl;
-            t << ";" << endl;
-            t << "; ==============================================================================" << "\n" << endl;
-
-            t << endl;
-
-            t << "EXPORTS" << endl;
-            t << "\tqt_plugin_query_verification_data @ 1 NONAME" << endl;
-            t << "\tqt_plugin_instance @ 2 NONAME" << endl;
-            t << endl;
-        } else {
-            PRINT_FILE_CREATE_ERROR(QString(PLUGIN_COMMON_DEF_FILE_ACTUAL))
-        }
-    }
-}
-
 void SymbianMakefileGenerator::init()
 {
     MakefileGenerator::init();
-    fixedTarget = escapeFilePath(fileFixify(project->first("TARGET")));
-    fixedTarget = removePathSeparators(fixedTarget);
-    removeSpecialCharacters(fixedTarget);
+    SymbianCommonGenerator::init();
 
     if (0 != project->values("QMAKE_PLATFORM").size())
@@ -632 +279 @@
     project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
 
-    // bld.inf
+    // Disallow renaming of bld.inf.
+    project->values("MAKEFILE").clear();
     project->values("MAKEFILE") += BLD_INF_FILENAME;
 
     // .mmp
+    mmpFileName = fixedTarget;
+    if (targetType == TypeExe)
+        mmpFileName.append("_exe");
+    else if (targetType == TypeDll || targetType == TypePlugin)
+        mmpFileName.append("_dll");
+    else if (targetType == TypeLib)
+        mmpFileName.append("_lib");
+    mmpFileName.append(Option::mmp_ext);
+
     initMmpVariables();
 
-    // Check TARGET.UID3 presence
-    if (0 != project->values("TARGET.UID3").size()) {
-        uid3 = project->first("TARGET.UID3");
-    } else {
-        uid3 = generateUID3();
-    }
-
-    if ((project->values("TEMPLATE")).contains("app"))
-        targetType = TypeExe;
-    else if ((project->values("TEMPLATE")).contains("lib")) {
-        // Check CONFIG to see if we are to build staticlib or dll
-        if (project->isActiveConfig("staticlib") || project->isActiveConfig("static"))
-            targetType = TypeLib;
-        else if (project->isActiveConfig("plugin"))
-            targetType = TypePlugin;
-        else
-            targetType = TypeDll;
-    } else {
-        targetType = TypeSubdirs;
-    }
-
-    if (0 != project->values("TARGET.UID2").size()) {
-        uid2 = project->first("TARGET.UID2");
-    } else if (project->isActiveConfig("stdbinary")) {
-        uid2 = "0x20004C45";
-    } else {
-        if (targetType == TypeExe) {
-            if (project->values("QT").contains("gui", Qt::CaseInsensitive)) {
-                // exe and gui -> uid2 needed
-                uid2 = "0x100039CE";
-            } else {
-                // exe but not gui: uid2 is ignored anyway -> set it to 0
-                uid2 = "0";
-            }
-        } else if (targetType == TypeDll || targetType == TypeLib || targetType == TypePlugin) {
-            uid2 = "0x1000008d";
-        }
-    }
+    uid2 = project->first("TARGET.UID2");
 
     uid2 = uid2.trimmed();
-    uid3 = uid3.trimmed();
-
-    // UID is valid as either hex or decimal, so just convert it to number and back to hex
-    // to get proper string for private dir
-    bool conversionOk = false;
-    uint uidNum = uid3.toUInt(&conversionOk, 0);
-
-    if (!conversionOk) {
-        fprintf(stderr, "Error: Invalid UID \"%s\".\n", uid3.toUtf8().constData());
-    } else {
-        privateDirUid.setNum(uidNum, 16);
-        while (privateDirUid.length() < 8)
-            privateDirUid.insert(0, QLatin1Char('0'));
-    }
 }
 
@@ -886 +492 @@
     t << "// This file is generated by qmake and should not be modified by the" << endl;
     t << "// user." << endl;
-    t << "//  Name        : " << escapeFilePath(fileFixify(project->projectFile().remove(project->projectFile().length() - 4, 4))) << Option::mmp_ext << endl;
+    t << "//  Name        : " << mmpFileName << endl;
     t << "// ==============================================================================" << endl << endl;
 }
 
-void SymbianMakefileGenerator::writeMmpFile(QString &filename, QStringList &symbianLangCodes)
+void SymbianMakefileGenerator::writeMmpFile(QString &filename, const SymbianLocalizationList &symbianLocalizationList)
 {
     QFile ft(filename);
@@ -902 +508 @@
         writeMmpFileTargetPart(t);
 
-        writeMmpFileResourcePart(t, symbianLangCodes);
+        writeMmpFileResourcePart(t, symbianLocalizationList);
 
         writeMmpFileMacrosPart(t);
@@ -1044 +650 @@
     \private\10003a3f\import\apps directory.
 */
-void SymbianMakefileGenerator::writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes)
+void SymbianMakefileGenerator::writeMmpFileResourcePart(QTextStream& t, const SymbianLocalizationList &symbianLocalizationList)
 {
     if ((targetType == TypeExe) &&
@@ -1054 +660 @@
         t << "SOURCEPATH\t\t\t. " << endl;
         t << "LANG SC ";    // no endl
-        foreach(QString lang, symbianLangCodes) {
-            t << lang << " "; // no endl
+        SymbianLocalizationListIterator iter(symbianLocalizationList);
+        while (iter.hasNext()) {
+            const SymbianLocalization &loc = iter.next();
+            t << loc.symbianLanguageCode << " "; // no endl
         }
         t << endl;
@@ -1118 +726 @@
                 // ARMV5 build directory for library type. We default to shared
                 // library, since that is more common.
-                QString udebStaticLibLocation(epocRoot());
+                QString udebStaticLibLocation(qt_epocRoot());
                 QString urelStaticLibLocation(udebStaticLibLocation);
                 udebStaticLibLocation += QString("epoc32/release/armv5/udeb/%1.lib").arg(lib);
@@ -1265 +873 @@
 }
 
-void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension, const QString &iconFile, DeploymentList &depList)
+void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension, const QString &iconFile)
 {
     // Read user defined bld inf rules
@@ -1296 +904 @@
     // Add includes of subdirs bld.inf files
 
-    QString mmpfilename = escapeFilePath(fileFixify(project->projectFile()));
-    mmpfilename = mmpfilename.replace(mmpfilename.lastIndexOf("."), 4, Option::mmp_ext);
     QString currentPath = qmake_getpwd();
     QDir directory(currentPath);
@@ -1303 +909 @@
     const QStringList &subdirs = project->values("SUBDIRS");
     foreach(QString item, subdirs) {
+        bool fromFile = false;
         QString fixedItem;
         if (!project->isEmpty(item + ".file")) {
             fixedItem = project->first(item + ".file");
+            fromFile = true;
         } else if (!project->isEmpty(item + ".subdir")) {
             fixedItem = project->first(item + ".subdir");
+            fromFile = false;
         } else {
             fixedItem = item;
+            fromFile = item.endsWith(Option::pro_ext);
         }
 
@@ -1318 +928 @@
         QFileInfo subdir(fileInfo(fixedItem));
         QString relativePath = directory.relativeFilePath(fixedItem);
-        QString subdirFileName = subdir.completeBaseName();
-        QString fullProName = subdir.absoluteFilePath();;
+        QString fullProName = subdir.absoluteFilePath();
         QString bldinfFilename;
+        QString subdirFileName;
+
+        if (fromFile) {
+            subdirFileName = subdir.completeBaseName();
+        } else {
+            subdirFileName = subdir.fileName();
+        }
 
         if (subdir.isDir()) {
@@ -1342 +958 @@
         QString bldinfDefine = QString("BLD_INF_") + subdirFileName + QString("_") + uid;
         bldinfDefine = bldinfDefine.toUpper();
-        removeSpecialCharacters(bldinfDefine);
+
+        // replace anything not alphanumeric with underscore
+        QRegExp replacementMask(DEFINE_REPLACE_REGEXP);
+        bldinfDefine.replace(replacementMask, QLatin1String("_"));
 
         if (!condition.isEmpty())
@@ -1379 +998 @@
 
     writeBldInfMkFilePart(t, addDeploymentExtension);
-    if (targetType != TypeSubdirs) {
-        QString shortProFilename = project->projectFile();
-        shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
-        shortProFilename.replace(Option::pro_ext, QString(""));
-
-        QString mmpFilename = shortProFilename + QString("_") + uid3 + Option::mmp_ext;
-
-        t << mmpFilename << endl;
-    }
+    if (targetType != TypeSubdirs)
+        t << mmpFileName << endl;
 
     userItems = userBldInfRules.value(mmpTag);
@@ -1421 +1033 @@
 }
 
-void SymbianMakefileGenerator::writeRegRssFile(QMap<QString, QStringList> &userItems)
-{
-    QString filename(fixedTarget);
-    filename.append("_reg.rss");
-    QFile ft(filename);
-    if (ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-        QTextStream t(&ft);
-        t << "// ============================================================================" << endl;
-        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " QT_VERSION_STR ") on: ";
-        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-        t << "// * This file is generated by qmake and should not be modified by the" << endl;
-        t << "// * user." << endl;
-        t << "// ============================================================================" << endl;
-        t << endl;
-        t << "#include <" << fixedTarget << ".rsg>" << endl;
-        t << "#include <appinfo.rh>" << endl;
-        foreach(QString item, userItems[RSS_TAG_HEADER])
-            t << item << endl;
-        t << endl;
-        t << "UID2 KUidAppRegistrationResourceFile" << endl;
-        t << "UID3 " << uid3 << endl << endl;
-        t << "RESOURCE APP_REGISTRATION_INFO" << endl;
-        t << "\t{" << endl;
-        t << "\tapp_file=\"" << fixedTarget << "\";" << endl;
-        t << "\tlocalisable_resource_file=\"" RESOURCE_DIRECTORY_RESOURCE << fixedTarget << "\";" << endl;
-
-        writeRegRssList(t, userItems[RSS_TAG_SERVICE_LIST],
-                        QLatin1String(RSS_TAG_SERVICE_LIST),
-                        QLatin1String("SERVICE_INFO"));
-        writeRegRssList(t, userItems[RSS_TAG_FILE_OWNERSHIP_LIST],
-                        QLatin1String(RSS_TAG_FILE_OWNERSHIP_LIST),
-                        QLatin1String("FILE_OWNERSHIP_INFO"));
-        writeRegRssList(t, userItems[RSS_TAG_DATATYPE_LIST],
-                        QLatin1String(RSS_TAG_DATATYPE_LIST),
-                        QLatin1String("DATATYPE"));
-        t << endl;
-
-        foreach(QString item, userItems[RSS_TAG_DEFAULT])
-            t << "\t" << item.replace("\n","\n\t") << endl;
-        t << "\t}" << endl;
-
-        foreach(QString item, userItems[RSS_TAG_FOOTER])
-            t << item << endl;
-    } else {
-        PRINT_FILE_CREATE_ERROR(filename)
-    }
-}
-
-void SymbianMakefileGenerator::writeRegRssList(QTextStream &t,
-                                               QStringList &userList,
-                                               const QString &listTag,
-                                               const QString &listItem)
-{
-    int itemCount = userList.count();
-    if (itemCount) {
-        t << "\t" << listTag << " ="<< endl;
-        t << "\t\t{" << endl;
-        foreach(QString item, userList) {
-            t << "\t\t" << listItem << endl;
-            t << "\t\t\t{" << endl;
-            t << "\t\t\t" << item.replace("\n","\n\t\t\t") << endl;
-            t << "\t\t\t}";
-            if (--itemCount)
-                t << ",";
-            t << endl;
-        }
-        t << "\t\t}; "<< endl;
-    }
-}
-
-void SymbianMakefileGenerator::writeRssFile(QString &numberOfIcons, QString &iconFile)
-{
-    QString filename(fixedTarget);
-    filename.append(".rss");
-    QFile ft(filename);
-    if (ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-        QTextStream t(&ft);
-        t << "// ============================================================================" << endl;
-        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " QT_VERSION_STR ") on: ";
-        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-        t << "// * This file is generated by qmake and should not be modified by the" << endl;
-        t << "// * user." << endl;
-        t << "// ============================================================================" << endl;
-        t << endl;
-        t << "#include <appinfo.rh>" << endl;
-        t << "#include \"" << fixedTarget << ".loc\"" << endl;
-        t << endl;
-        t << "RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info" << endl;
-        t << "\t{" << endl;
-        t << "\tshort_caption = STRING_r_short_caption;" << endl;
-        t << "\tcaption_and_icon =" << endl;
-        t << "\tCAPTION_AND_ICON_INFO" << endl;
-        t << "\t\t{" << endl;
-        t << "\t\tcaption = STRING_r_caption;" << endl;
-
-        QString rssIconFile = iconFile;
-        rssIconFile = rssIconFile.replace("/", "\\\\");
-
-        if (numberOfIcons.isEmpty() || rssIconFile.isEmpty()) {
-            // There can be maximum one item in this tag, validated when parsed
-            t << "\t\tnumber_of_icons = 0;" << endl;
-            t << "\t\ticon_file = \"\";" << endl;
-        } else {
-            // There can be maximum one item in this tag, validated when parsed
-            t << "\t\tnumber_of_icons = " << numberOfIcons << ";" << endl;
-            t << "\t\ticon_file = \"" << rssIconFile << "\";" << endl;
-        }
-        t << "\t\t};" << endl;
-        t << "\t}" << endl;
-        t << endl;
-    } else {
-        PRINT_FILE_CREATE_ERROR(filename);
-    }
-}
-
-void SymbianMakefileGenerator::writeLocFile(QStringList &symbianLangCodes)
-{
-    QString filename(fixedTarget);
-    filename.append(".loc");
-    QFile ft(filename);
-    if (ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-        QTextStream t(&ft);
-        t << "// ============================================================================" << endl;
-        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " QT_VERSION_STR ") on: ";
-        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-        t << "// * This file is generated by qmake and should not be modified by the" << endl;
-        t << "// * user." << endl;
-        t << "// ============================================================================" << endl;
-        t << endl;
-        t << "#ifdef LANGUAGE_SC" << endl;
-        t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
-        foreach(QString lang, symbianLangCodes) {
-            t << "#elif defined LANGUAGE_" << lang << endl;
-            t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
-            t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
-        }
-        t << "#else" << endl;
-        t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
-        t << "#endif" << endl;
-    } else {
-        PRINT_FILE_CREATE_ERROR(filename);
-    }
-}
-
-void SymbianMakefileGenerator::readRssRules(QString &numberOfIcons,
-                                            QString &iconFile, QMap<QString,
-                                            QStringList> &userRssRules)
-{
-    for (QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-        if (it.key().startsWith(RSS_RULES_BASE)) {
-            QString newKey = it.key().mid(sizeof(RSS_RULES_BASE) - 1);
-            if (newKey.isEmpty()) {
-                fprintf(stderr, "Warning: Empty RSS_RULES_BASE key encountered\n");
-                continue;
-            }
-            QStringList newValues;
-            QStringList values = it.value();
-            foreach(QString item, values) {
-                // If there is no stringlist defined for a rule, use rule value directly
-                // This is convenience for defining single line statements
-                if (project->values(item).isEmpty()) {
-                    newValues << item;
-                } else {
-                    QStringList itemList;
-                    foreach(QString itemRow, project->values(item)) {
-                        itemList << itemRow;
-                    }
-                    newValues << itemList.join("\n");
-                }
-            }
-            // Verify thet there is exactly one value in RSS_TAG_NBROFICONS
-            if (newKey == RSS_TAG_NBROFICONS) {
-                if (newValues.count() == 1) {
-                    numberOfIcons = newValues[0];
-                } else {
-                    fprintf(stderr, "Warning: There must be exactly one value in '%s%s'\n",
-                            RSS_RULES_BASE, RSS_TAG_NBROFICONS);
-                    continue;
-                }
-            // Verify thet there is exactly one value in RSS_TAG_ICONFILE
-            } else if (newKey == RSS_TAG_ICONFILE) {
-                if (newValues.count() == 1) {
-                    iconFile = newValues[0];
-                } else {
-                    fprintf(stderr, "Warning: There must be exactly one value in '%s%s'\n",
-                            RSS_RULES_BASE, RSS_TAG_ICONFILE);
-                    continue;
-                }
-            } else if (newKey == RSS_TAG_HEADER
-                       || newKey == RSS_TAG_SERVICE_LIST
-                       || newKey == RSS_TAG_FILE_OWNERSHIP_LIST
-                       || newKey == RSS_TAG_DATATYPE_LIST
-                       || newKey == RSS_TAG_FOOTER
-                       || newKey == RSS_TAG_DEFAULT) {
-                userRssRules[newKey] = newValues;
-                continue;
-            } else {
-                fprintf(stderr, "Warning: Unsupported key:'%s%s'\n",
-                        RSS_RULES_BASE, newKey.toLatin1().constData());
-                continue;
-            }
-        }
-    }
-
-    QStringList newValues;
-    foreach(QString item, project->values(RSS_RULES)) {
-        // If there is no stringlist defined for a rule, use rule value directly
-        // This is convenience for defining single line statements
-        if (project->values(item).isEmpty()) {
-            newValues << item;
-        } else {
-            newValues << project->values(item);
-        }
-    }
-    userRssRules[RSS_TAG_DEFAULT] << newValues;
-
-    // Validate that either both RSS_TAG_NBROFICONS and RSS_TAG_ICONFILE keys exist
-    // or neither of them exist
-    if (!((numberOfIcons.isEmpty() && iconFile.isEmpty()) ||
-            (!numberOfIcons.isEmpty() && !iconFile.isEmpty()))) {
-        numberOfIcons.clear();
-        iconFile.clear();
-        fprintf(stderr, "Warning: Both or neither of '%s%s' and '%s%s' keys must exist.\n",
-                RSS_RULES_BASE, RSS_TAG_NBROFICONS, RSS_RULES_BASE, RSS_TAG_ICONFILE);
-    }
-
-    // Validate that RSS_TAG_NBROFICONS contains only numbers
-    if (!numberOfIcons.isEmpty()) {
-        bool ok;
-        numberOfIcons = numberOfIcons.simplified();
-        numberOfIcons.toInt(&ok);
-        if (!ok) {
-            numberOfIcons.clear();
-            iconFile.clear();
-            fprintf(stderr, "Warning: '%s%s' must be integer in decimal format.\n",
-                    RSS_RULES_BASE, RSS_TAG_NBROFICONS);
-        }
-    }
-}
-
-QStringList SymbianMakefileGenerator::symbianLangCodesFromTsFiles()
-{
-    QStringList tsfiles;
-    QStringList symbianLangCodes;
-    tsfiles << project->values("TRANSLATIONS");
-
-    fillQt2S60LangMapTable();
-
-    foreach(QString file, tsfiles) {
-        int extIndex = file.lastIndexOf(".");
-        int langIndex = file.lastIndexOf("_", (extIndex - file.length()));
-        langIndex += 1;
-        QString qtlang = file.mid(langIndex, extIndex - langIndex);
-        QString s60lang = qt2S60LangMapTable.value(qtlang, QString("SC"));
-
-        if (!symbianLangCodes.contains(s60lang) && s60lang != "SC")
-            symbianLangCodes += s60lang;
-    }
-
-    return symbianLangCodes;
-}
-
-void SymbianMakefileGenerator::fillQt2S60LangMapTable()
-{
-    qt2S60LangMapTable.reserve(170); // 165 items at time of writing.
-    qt2S60LangMapTable.insert("ab", "SC");            //Abkhazian                     //
-    qt2S60LangMapTable.insert("om", "SC");            //Afan                          //
-    qt2S60LangMapTable.insert("aa", "SC");            //Afar                          //
-    qt2S60LangMapTable.insert("af", "34");            //Afrikaans                     //Afrikaans
-    qt2S60LangMapTable.insert("sq", "35");            //Albanian                      //Albanian
-    qt2S60LangMapTable.insert("am", "36");            //Amharic                       //Amharic
-    qt2S60LangMapTable.insert("ar", "37");            //Arabic                        //Arabic
-    qt2S60LangMapTable.insert("hy", "38");            //Armenian                      //Armenian
-    qt2S60LangMapTable.insert("as", "SC");            //Assamese                      //
-    qt2S60LangMapTable.insert("ay", "SC");            //Aymara                        //
-    qt2S60LangMapTable.insert("az", "SC");            //Azerbaijani                   //
-    qt2S60LangMapTable.insert("ba", "SC");            //Bashkir                       //
-    qt2S60LangMapTable.insert("eu", "SC");            //Basque                        //
-    qt2S60LangMapTable.insert("bn", "41");            //Bengali                       //Bengali
-    qt2S60LangMapTable.insert("dz", "SC");            //Bhutani                       //
-    qt2S60LangMapTable.insert("bh", "SC");            //Bihari                        //
-    qt2S60LangMapTable.insert("bi", "SC");            //Bislama                       //
-    qt2S60LangMapTable.insert("br", "SC");            //Breton                        //
-    qt2S60LangMapTable.insert("bg", "42");            //Bulgarian                     //Bulgarian
-    qt2S60LangMapTable.insert("my", "43");            //Burmese                       //Burmese
-    qt2S60LangMapTable.insert("be", "40");            //Byelorussian                  //Belarussian
-    qt2S60LangMapTable.insert("km", "SC");            //Cambodian                     //
-    qt2S60LangMapTable.insert("ca", "44");            //Catalan                       //Catalan
-    qt2S60LangMapTable.insert("zh", "SC");            //Chinese                       //
-    qt2S60LangMapTable.insert("co", "SC");            //Corsican                      //
-    qt2S60LangMapTable.insert("hr", "45");            //Croatian                      //Croatian
-    qt2S60LangMapTable.insert("cs", "25");            //Czech                         //Czech
-    qt2S60LangMapTable.insert("da", "07");            //Danish                        //Danish
-    qt2S60LangMapTable.insert("nl", "18");            //Dutch                         //Dutch
-    qt2S60LangMapTable.insert("en", "01");            //English                       //English(UK)
-    qt2S60LangMapTable.insert("eo", "SC");            //Esperanto                     //
-    qt2S60LangMapTable.insert("et", "49");            //Estonian                      //Estonian
-    qt2S60LangMapTable.insert("fo", "SC");            //Faroese                       //
-    qt2S60LangMapTable.insert("fj", "SC");            //Fiji                          //
-    qt2S60LangMapTable.insert("fi", "09");            //Finnish                       //Finnish
-    qt2S60LangMapTable.insert("fr", "02");            //French                        //French
-    qt2S60LangMapTable.insert("fy", "SC");            //Frisian                       //
-    qt2S60LangMapTable.insert("gd", "52");            //Gaelic                        //Gaelic
-    qt2S60LangMapTable.insert("gl", "SC");            //Galician                      //
-    qt2S60LangMapTable.insert("ka", "53");            //Georgian                      //Georgian
-    qt2S60LangMapTable.insert("de", "03");            //German                        //German
-    qt2S60LangMapTable.insert("el", "54");            //Greek                         //Greek
-    qt2S60LangMapTable.insert("kl", "SC");            //Greenlandic                   //
-    qt2S60LangMapTable.insert("gn", "SC");            //Guarani                       //
-    qt2S60LangMapTable.insert("gu", "56");            //Gujarati                      //Gujarati
-    qt2S60LangMapTable.insert("ha", "SC");            //Hausa                         //
-    qt2S60LangMapTable.insert("he", "57");            //Hebrew                        //Hebrew
-    qt2S60LangMapTable.insert("hi", "58");            //Hindi                         //Hindi
-    qt2S60LangMapTable.insert("hu", "17");            //Hungarian                     //Hungarian
-    qt2S60LangMapTable.insert("is", "15");            //Icelandic                     //Icelandic
-    qt2S60LangMapTable.insert("id", "59");            //Indonesian                    //Indonesian
-    qt2S60LangMapTable.insert("ia", "SC");            //Interlingua                   //
-    qt2S60LangMapTable.insert("ie", "SC");            //Interlingue                   //
-    qt2S60LangMapTable.insert("iu", "SC");            //Inuktitut                     //
-    qt2S60LangMapTable.insert("ik", "SC");            //Inupiak                       //
-    qt2S60LangMapTable.insert("ga", "60");            //Irish                         //Irish
-    qt2S60LangMapTable.insert("it", "05");            //Italian                       //Italian
-    qt2S60LangMapTable.insert("ja", "32");            //Japanese                      //Japanese
-    qt2S60LangMapTable.insert("jv", "SC");            //Javanese                      //
-    qt2S60LangMapTable.insert("kn", "62");            //Kannada                       //Kannada
-    qt2S60LangMapTable.insert("ks", "SC");            //Kashmiri                      //
-    qt2S60LangMapTable.insert("kk", "63");            //Kazakh                        //Kazakh
-    qt2S60LangMapTable.insert("rw", "SC");            //Kinyarwanda                   //
-    qt2S60LangMapTable.insert("ky", "SC");            //Kirghiz                       //
-    qt2S60LangMapTable.insert("ko", "65");            //Korean                        //Korean
-    qt2S60LangMapTable.insert("ku", "SC");            //Kurdish                       //
-    qt2S60LangMapTable.insert("rn", "SC");            //Kurundi                       //
-    qt2S60LangMapTable.insert("lo", "66");            //Laothian                      //Laothian
-    qt2S60LangMapTable.insert("la", "SC");            //Latin                         //
-    qt2S60LangMapTable.insert("lv", "67");            //Latvian                       //Latvian
-    qt2S60LangMapTable.insert("ln", "SC");            //Lingala                       //
-    qt2S60LangMapTable.insert("lt", "68");            //Lithuanian                    //Lithuanian
-    qt2S60LangMapTable.insert("mk", "69");            //Macedonian                    //Macedonian
-    qt2S60LangMapTable.insert("mg", "SC");            //Malagasy                      //
-    qt2S60LangMapTable.insert("ms", "70");            //Malay                         //Malay
-    qt2S60LangMapTable.insert("ml", "71");            //Malayalam                     //Malayalam
-    qt2S60LangMapTable.insert("mt", "SC");            //Maltese                       //
-    qt2S60LangMapTable.insert("mi", "SC");            //Maori                         //
-    qt2S60LangMapTable.insert("mr", "72");            //Marathi                       //Marathi
-    qt2S60LangMapTable.insert("mo", "73");            //Moldavian                     //Moldovian
-    qt2S60LangMapTable.insert("mn", "74");            //Mongolian                     //Mongolian
-    qt2S60LangMapTable.insert("na", "SC");            //Nauru                         //
-    qt2S60LangMapTable.insert("ne", "SC");            //Nepali                        //
-    qt2S60LangMapTable.insert("nb", "08");            //Norwegian                     //Norwegian
-    qt2S60LangMapTable.insert("oc", "SC");            //Occitan                       //
-    qt2S60LangMapTable.insert("or", "SC");            //Oriya                         //
-    qt2S60LangMapTable.insert("ps", "SC");            //Pashto                        //
-    qt2S60LangMapTable.insert("fa", "SC");            //Persian                       //
-    qt2S60LangMapTable.insert("pl", "27");            //Polish                        //Polish
-    qt2S60LangMapTable.insert("pt", "13");            //Portuguese                    //Portuguese
-    qt2S60LangMapTable.insert("pa", "77");            //Punjabi                       //Punjabi
-    qt2S60LangMapTable.insert("qu", "SC");            //Quechua                       //
-    qt2S60LangMapTable.insert("rm", "SC");            //RhaetoRomance                 //
-    qt2S60LangMapTable.insert("ro", "78");            //Romanian                      //Romanian
-    qt2S60LangMapTable.insert("ru", "16");            //Russian                       //Russian
-    qt2S60LangMapTable.insert("sm", "SC");            //Samoan                        //
-    qt2S60LangMapTable.insert("sg", "SC");            //Sangho                        //
-    qt2S60LangMapTable.insert("sa", "SC");            //Sanskrit                      //
-    qt2S60LangMapTable.insert("sr", "79");            //Serbian                       //Serbian
-    qt2S60LangMapTable.insert("sh", "SC");            //SerboCroatian                 //
-    qt2S60LangMapTable.insert("st", "SC");            //Sesotho                       //
-    qt2S60LangMapTable.insert("tn", "SC");            //Setswana                      //
-    qt2S60LangMapTable.insert("sn", "SC");            //Shona                         //
-    qt2S60LangMapTable.insert("sd", "SC");            //Sindhi                        //
-    qt2S60LangMapTable.insert("si", "80");            //Singhalese                    //Sinhalese
-    qt2S60LangMapTable.insert("ss", "SC");            //Siswati                       //
-    qt2S60LangMapTable.insert("sk", "26");            //Slovak                        //Slovak
-    qt2S60LangMapTable.insert("sl", "28");            //Slovenian                     //Slovenian
-    qt2S60LangMapTable.insert("so", "81");            //Somali                        //Somali
-    qt2S60LangMapTable.insert("es", "04");            //Spanish                       //Spanish
-    qt2S60LangMapTable.insert("su", "SC");            //Sundanese                     //
-    qt2S60LangMapTable.insert("sw", "84");            //Swahili                       //Swahili
-    qt2S60LangMapTable.insert("sv", "06");            //Swedish                       //Swedish
-    qt2S60LangMapTable.insert("tl", "39");            //Tagalog                       //Tagalog
-    qt2S60LangMapTable.insert("tg", "SC");            //Tajik                         //
-    qt2S60LangMapTable.insert("ta", "87");            //Tamil                         //Tamil
-    qt2S60LangMapTable.insert("tt", "SC");            //Tatar                         //
-    qt2S60LangMapTable.insert("te", "88");            //Telugu                        //Telugu
-    qt2S60LangMapTable.insert("th", "33");            //Thai                          //Thai
-    qt2S60LangMapTable.insert("bo", "89");            //Tibetan                       //Tibetan
-    qt2S60LangMapTable.insert("ti", "90");            //Tigrinya                      //Tigrinya
-    qt2S60LangMapTable.insert("to", "SC");            //Tonga                         //
-    qt2S60LangMapTable.insert("ts", "SC");            //Tsonga                        //
-    qt2S60LangMapTable.insert("tr", "14");            //Turkish                       //Turkish
-    qt2S60LangMapTable.insert("tk", "92");            //Turkmen                       //Turkmen
-    qt2S60LangMapTable.insert("tw", "SC");            //Twi                           //
-    qt2S60LangMapTable.insert("ug", "SC");            //Uigur                         //
-    qt2S60LangMapTable.insert("uk", "93");            //Ukrainian                     //Ukrainian
-    qt2S60LangMapTable.insert("ur", "94");            //Urdu                          //Urdu
-    qt2S60LangMapTable.insert("uz", "SC");            //Uzbek                         //
-    qt2S60LangMapTable.insert("vi", "96");            //Vietnamese                    //Vietnamese
-    qt2S60LangMapTable.insert("vo", "SC");            //Volapuk                       //
-    qt2S60LangMapTable.insert("cy", "97");            //Welsh                         //Welsh
-    qt2S60LangMapTable.insert("wo", "SC");            //Wolof                         //
-    qt2S60LangMapTable.insert("xh", "SC");            //Xhosa                         //
-    qt2S60LangMapTable.insert("yi", "SC");            //Yiddish                       //
-    qt2S60LangMapTable.insert("yo", "SC");            //Yoruba                        //
-    qt2S60LangMapTable.insert("za", "SC");            //Zhuang                        //
-    qt2S60LangMapTable.insert("zu", "98");            //Zulu                          //Zulu
-    qt2S60LangMapTable.insert("nn", "75");            //Nynorsk                       //NorwegianNynorsk
-    qt2S60LangMapTable.insert("bs", "SC");            //Bosnian                       //
-    qt2S60LangMapTable.insert("dv", "SC");            //Divehi                        //
-    qt2S60LangMapTable.insert("gv", "SC");            //Manx                          //
-    qt2S60LangMapTable.insert("kw", "SC");            //Cornish                       //
-    qt2S60LangMapTable.insert("ak", "SC");            //Akan                          //
-    qt2S60LangMapTable.insert("kok", "SC");           //Konkani                       //
-    qt2S60LangMapTable.insert("gaa", "SC");           //Ga                            //
-    qt2S60LangMapTable.insert("ig", "SC");            //Igbo                          //
-    qt2S60LangMapTable.insert("kam", "SC");           //Kamba                         //
-    qt2S60LangMapTable.insert("syr", "SC");           //Syriac                        //
-    qt2S60LangMapTable.insert("byn", "SC");           //Blin                          //
-    qt2S60LangMapTable.insert("gez", "SC");           //Geez                          //
-    qt2S60LangMapTable.insert("kfo", "SC");           //Koro                          //
-    qt2S60LangMapTable.insert("sid", "SC");           //Sidamo                        //
-    qt2S60LangMapTable.insert("cch", "SC");           //Atsam                         //
-    qt2S60LangMapTable.insert("tig", "SC");           //Tigre                         //
-    qt2S60LangMapTable.insert("kaj", "SC");           //Jju                           //
-    qt2S60LangMapTable.insert("fur", "SC");           //Friulian                      //
-    qt2S60LangMapTable.insert("ve", "SC");            //Venda                         //
-    qt2S60LangMapTable.insert("ee", "SC");            //Ewe                           //
-    qt2S60LangMapTable.insert("wa", "SC");            //Walamo                        //
-    qt2S60LangMapTable.insert("haw", "SC");           //Hawaiian                      //
-    qt2S60LangMapTable.insert("kcg", "SC");           //Tyap                          //
-    qt2S60LangMapTable.insert("ny", "SC");            //Chewa                         //
-}
-
 void SymbianMakefileGenerator::appendIfnotExist(QStringList &list, QString value)
 {
@@ -1867 +1043 @@
     foreach(QString item, values)
         appendIfnotExist(list, item);
-}
-
-QString SymbianMakefileGenerator::removePathSeparators(QString &file)
-{
-    QString ret = file;
-    while (ret.indexOf(QDir::separator()) > 0) {
-        ret.remove(0, ret.indexOf(QDir::separator()) + 1);
-    }
-
-    return ret;
 }
 
@@ -1904 +1070 @@
         t << cmd << " " << cmdOptions << " \"" << QDir::toNativeSeparators(item) << "\"" << endl;
 #else
-        t << "\t-if test -f " << QDir::toNativeSeparators(item) << "; then ";
+        t << "\t-if test -e " << QDir::toNativeSeparators(item) << "; then ";
         t << cmd << " " << cmdOptions << " " << QDir::toNativeSeparators(item) << "; fi" << endl;
 #endif
     }
-}
-
-void SymbianMakefileGenerator::removeSpecialCharacters(QString& str)
-{
-    // When modifying this method check also application_icon.prf
-    str.replace(QString("/"), QString("_"));
-    str.replace(QString("\\"), QString("_"));
-    str.replace(QString("-"), QString("_"));
-    str.replace(QString(":"), QString("_"));
-    str.replace(QString("."), QString("_"));
-    str.replace(QString(" "), QString("_"));
-}
-
-void SymbianMakefileGenerator::writeSisTargets(QTextStream &t)
-{
-    t << "-include " MAKE_CACHE_NAME << endl;
-    t << endl;
-
-    t << SIS_TARGET ":" << endl;
-    QString siscommand = QString::fromLatin1("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %4," \
-                                  "$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) %4," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %5))," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %6)")
-                          .arg(fixedTarget)
-                          .arg("pkg")
-                          .arg(MAKE_CACHE_NAME)
-                          .arg(OK_SIS_TARGET)
-                          .arg(FAIL_SIS_NOCACHE_TARGET)
-                          .arg(FAIL_SIS_NOPKG_TARGET);
-    t << siscommand << endl;
-    t << endl;
-
-    t << OK_SIS_TARGET ":" << endl;
-
-    QString pkgcommand = QString::fromLatin1("\tcreatepackage.bat $(QT_SIS_OPTIONS) %1_template.%2 $(QT_SIS_TARGET) " \
-                                 "$(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)")
-                          .arg(fixedTarget)
-                          .arg("pkg");
-    t << pkgcommand << endl;
-    t << endl;
-
-    QString sisName = fixedTarget;
-    sisName += ".sis";
-
-    t << sisName << ":" << endl;
-    t << "\t$(MAKE) -s -f $(MAKEFILE) " SIS_TARGET << endl << endl;
-
-    t << ROM_STUB_SIS_TARGET ":" << endl;
-    QString stubsiscommand = QString::fromLatin1("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %4," \
-                                  "$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) %4," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %5))," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %6)")
-                          .arg(fixedTarget)
-                          .arg("pkg")
-                          .arg(MAKE_CACHE_NAME)
-                          .arg(OK_ROM_STUB_SIS_TARGET)
-                          .arg(FAIL_SIS_NOCACHE_TARGET)
-                          .arg(FAIL_SIS_NOPKG_TARGET);
-    t << stubsiscommand << endl;
-    t << endl;
-
-    t << OK_ROM_STUB_SIS_TARGET ":" << endl;
-
-    QString stubpkgcommand = QString::fromLatin1("\tcreatepackage.bat -s $(QT_SIS_OPTIONS) %1_template.%2 $(QT_SIS_TARGET) " \
-                                 "$(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)")
-                          .arg(fixedTarget)
-                          .arg("pkg");
-    t << stubpkgcommand << endl;
-    t << endl;
-
-    t << INSTALLER_SIS_TARGET ": " << sisName << endl;
-    siscommand = QString::fromLatin1("\t$(if $(wildcard %1_installer.%2)," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %3," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %4)")
-                          .arg(fixedTarget)
-                          .arg("pkg")
-                          .arg(OK_INSTALLER_SIS_TARGET)
-                          .arg(FAIL_SIS_NOPKG_TARGET);
-    t << siscommand << endl;
-    t << endl;
-
-    t << OK_INSTALLER_SIS_TARGET ": " << endl;
-
-    pkgcommand = QString::fromLatin1("\tcreatepackage.bat $(QT_SIS_OPTIONS) %1_installer.%2 - " \
-                         "$(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)")
-                  .arg(fixedTarget)
-                  .arg("pkg");
-    t << pkgcommand << endl;
-    t << endl;
-
-    t << FAIL_SIS_NOPKG_TARGET ":" << endl;
-    t << "\t$(error PKG file does not exist, '" SIS_TARGET "' and '" INSTALLER_SIS_TARGET "' target are only supported for executables or projects with DEPLOYMENT statement)" << endl;
-    t << endl;
-
-    t << FAIL_SIS_NOCACHE_TARGET ":" << endl;
-    t << "\t$(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target)" << endl;
-    t << endl;
 }
 
@@ -2064 +1131 @@
 }
 
-void SymbianMakefileGenerator::generateExecutionTargets(QTextStream& t, const QStringList& platforms)
-{
-    // create execution targets
-    if (targetType == TypeExe) {
-        if (platforms.contains("winscw")) {
-            t << "run:" << endl;
-            t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl;
-        }
-        t << "runonphone: sis" << endl;
-        t << "\trunonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis " << fixedTarget << ".sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl;
+// Returns a string that can be used as a dependency to loc file on other targets
+QString SymbianMakefileGenerator::generateLocFileTarget(QTextStream& t, const QString& locCmd)
+{
+    QString locFile;
+    if (targetType == TypeExe && !project->isActiveConfig("no_icon")) {
+        locFile = Option::fixPathToLocalOS(generateLocFileName());
+        t << locFile << QLatin1String(": ") << project->values("SYMBIAN_MATCHED_TRANSLATIONS").join(" ") << endl;
+        t << locCmd << endl;
         t << endl;
-    }
-}
+        locFile += QLatin1Char(' ');
+    }
+
+    return locFile;
+}

trunk/qmake/generators/symbian/symmake.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -44 +44 @@
 
 #include "initprojectdeploy_symbian.h"
+#include "symbiancommon.h"
 #include <makefile.h>
 
@@ -54 +55 @@
 #define SYMBIAN_TEST_CONFIG "symbian_test"
 
-class SymbianMakefileGenerator : public MakefileGenerator
+class SymbianMakefileGenerator : public MakefileGenerator, public SymbianCommonGenerator
 {
 protected:
-    enum TargetType {
-        TypeExe,
-        TypeDll,
-        TypeLib,
-        TypePlugin,
-        TypeSubdirs
-    };
-
     QString platform;
     QString uid2;
-    QString uid3;
-    QString privateDirUid;
-    TargetType targetType;
+    QString mmpFileName;
     QMap<QString, QStringList> sources;
     QMap<QString, QStringList> systeminclude;
@@ -77 +68 @@
     QStringList overriddenMmpKeywords;
 
-    QStringList generatedFiles;
-    QStringList generatedDirs;
-    QHash<QString, QString> qt2S60LangMapTable;
-
-    QString fixedTarget;
-
-    void removeSpecialCharacters(QString& str);
     QString fixPathForMmp(const QString& origPath, const QDir& parentDir);
     QString absolutizePath(const QString& origPath);
 
     virtual bool writeMakefile(QTextStream &t);
-    void generatePkgFile(const QString &iconFile, DeploymentList &depList);
-    bool containsStartWithItem(const QChar &c, const QStringList& src);
 
     virtual void init();
@@ -98 +80 @@
 
     void initMmpVariables();
+    void generateMmpFileName();
     void handleMmpRulesOverrides(QString &checkString,
                                  bool &inResourceBlock,
@@ -110 +93 @@
     void writeBldInfContent(QTextStream& t,
                             bool addDeploymentExtension,
-                            const QString &iconFile,
-                            DeploymentList &depList);
+                            const QString &iconFile);
 
     static bool removeDuplicatedStrings(QStringList& stringList);
 
     void writeMmpFileHeader(QTextStream &t);
-    void writeMmpFile(QString &filename, QStringList &symbianLangCodes);
+    void writeMmpFile(QString &filename, const SymbianLocalizationList &symbianLocalizationList);
     void writeMmpFileMacrosPart(QTextStream& t);
     void addMacro(QTextStream& t, const QString& value);
     void writeMmpFileTargetPart(QTextStream& t);
-    void writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes);
+    void writeMmpFileResourcePart(QTextStream& t, const SymbianLocalizationList &symbianLocalizationList);
     void writeMmpFileSystemIncludePart(QTextStream& t);
     void writeMmpFileIncludePart(QTextStream& t);
@@ -138 +120 @@
     void writeMmpFileRulesPart(QTextStream& t);
 
-    void writeCustomDefFile();
-
-    void writeRegRssFile(QMap<QString, QStringList> &useritems);
-    void writeRegRssList(QTextStream &t, QStringList &userList,
-                         const QString &listTag,
-                         const QString &listItem);
-    void writeRssFile(QString &numberOfIcons, QString &iconfile);
-    void writeLocFile(QStringList &symbianLangCodes);
-    void readRssRules(QString &numberOfIcons,
-                      QString &iconFile,
-                      QMap<QString, QStringList> &userRssRules);
-
-    QStringList symbianLangCodesFromTsFiles();
-    void fillQt2S60LangMapTable();
-
     void appendIfnotExist(QStringList &list, QString value);
     void appendIfnotExist(QStringList &list, QStringList values);
 
-    QString removePathSeparators(QString &file);
     QString removeTrailingPathSeparators(QString &file);
     void generateCleanCommands(QTextStream& t,
@@ -165 +131 @@
                                const QString& itemSuffix);
 
-    void writeSisTargets(QTextStream &t);
     void generateDistcleanTargets(QTextStream& t);
-    void generateExecutionTargets(QTextStream& t, const QStringList& platforms);
+    QString generateLocFileTarget(QTextStream& t, const QString& locCmd);
 
     // Subclass implements

trunk/qmake/generators/symbian/symmake_abld.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -50 +50 @@
 
 // Included from tools/shared
-#include <symbian/epocroot.h>
+#include <symbian/epocroot_p.h>
 
 #define DO_NOTHING_TARGET "do_nothing"
@@ -71 +71 @@
 void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly)
 {
-    QString gnuMakefileName = QLatin1String("Makefile_") + uid3;
-    removeSpecialCharacters(gnuMakefileName);
-    gnuMakefileName.append(".mk");
-
     QFile ft(gnuMakefileName);
     if (ft.open(QIODevice::WriteOnly)) {
@@ -189 +185 @@
     QTextStream t(&wrapperFile);
 
-    t << "# ==============================================================================" << endl;
-    t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-    t << QDateTime::currentDateTime().toString() << endl;
-    t << "# This file is generated by qmake and should not be modified by the" << endl;
-    t << "# user." << endl;
-    t << "#  Name        : " << wrapperFile.fileName() << endl;
-    t << "#  Description : Wrapper Makefile for calling Symbian build tools" << endl;
-    t << "#" << endl;
-    t << "# ==============================================================================" << "\n" << endl;
-    t << endl;
-
-    t << "MAKEFILE          = " << wrapperFile.fileName() << endl;
-    t << "QMAKE             = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
+    MakefileGenerator::writeHeader(t);
+
+    t << "MAKEFILE          = " << fileInfo(wrapperFile.fileName()).fileName() << endl;
+    t << "QMAKE             = " << var("QMAKE_QMAKE") << endl;
     t << "DEL_FILE          = " << var("QMAKE_DEL_FILE") << endl;
     t << "DEL_DIR           = " << var("QMAKE_DEL_DIR") << endl;
@@ -207 +194 @@
     t << "CHK_DIR_EXISTS    = " << var("QMAKE_CHK_DIR_EXISTS") << endl;
     t << "MKDIR             = " << var("QMAKE_MKDIR") << endl;
+#ifdef Q_OS_WIN32
     t << "XCOPY             = xcopy /d /f /h /r /y /i" << endl;
     t << "ABLD              = ABLD.BAT" << endl;
+#elif defined(Q_OS_MAC)
+    t << "XCOPY             = cp -R -v" << endl;
+    t << "ABLD              = abld" << endl;
+#else
+    t << "XCOPY             = cp -R -u -v" << endl;
+    t << "ABLD              = abld" << endl;
+#endif
     t << "DEBUG_PLATFORMS   = " << debugPlatforms.join(" ") << endl;
     t << "RELEASE_PLATFORMS = " << releasePlatforms.join(" ") << endl;
@@ -214 +209 @@
     t << endl;
     t << "ifeq (WINS,$(findstring WINS, $(PLATFORM)))" << endl;
-    t << "ZDIR=$(EPOCROOT)epoc32\\release\\$(PLATFORM)\\$(CFG)\\Z" << endl;
+    t << "ZDIR=$(EPOCROOT)" << QDir::toNativeSeparators("epoc32/release/$(PLATFORM)/$(CFG)/z") << endl;
     t << "else" << endl;
-    t << "ZDIR=$(EPOCROOT)epoc32\\data\\z" << endl;
+    t << "ZDIR=$(EPOCROOT)" << QDir::toNativeSeparators("epoc32/data/z") << endl;
     t << "endif" << endl;
     t << endl;
@@ -249 +244 @@
         t << "all: debug release" << endl;
         t << endl;
+
+        QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs();
+
         t << "qmake:" << endl;
-        t << "\t$(QMAKE) -spec symbian-abld -o \"" << fileInfo(Option::output.fileName()).fileName()
-          << "\" \"" << project->projectFile() << "\"" << endl;
-        t << endl;
-        t << BLD_INF_FILENAME ":" << endl;
-        t << "\t$(QMAKE)" << endl;
-        t << endl;
+        t << qmakeCmd << endl;
+        t << endl;
+
+        t << BLD_INF_FILENAME ": " << project->projectFile() << endl;
+        t << qmakeCmd << endl;
+        t << endl;
+
         t << "$(ABLD): " BLD_INF_FILENAME << endl;
         t << "\tbldmake bldfiles" << endl;
         t << endl;
 
-        t << "debug: $(ABLD)" << endl;
+        QString locFileDep = generateLocFileTarget(t, qmakeCmd);
+
+        t << "debug: " << locFileDep << "$(ABLD)" << endl;
         foreach(QString item, debugPlatforms) {
             t << "\t$(ABLD)" << testClause << " build " << item << " udeb" << endl;
         }
         t << endl;
-        t << "release: $(ABLD)" << endl;
+        t << "release: " << locFileDep << "$(ABLD)" << endl;
         foreach(QString item, releasePlatforms) {
             t << "\t$(ABLD)" << testClause << " build " << item << " urel" << endl;
@@ -273 +274 @@
         // For more specific builds, targets are in this form: build-platform, e.g. release-armv5
         foreach(QString item, debugPlatforms) {
-            t << "debug-" << item << ": $(ABLD)" << endl;
+            t << "debug-" << item << ": " << locFileDep << "$(ABLD)" << endl;
             t << "\t$(ABLD)" << testClause << " build " << item << " udeb" << endl;
         }
 
         foreach(QString item, releasePlatforms) {
-            t << "release-" << item << ": $(ABLD)" << endl;
+            t << "release-" << item << ": " << locFileDep << "$(ABLD)" << endl;
             t << "\t$(ABLD)" << testClause << " build " << item << " urel" << endl;
         }
@@ -310 +311 @@
         // -@ if NOT EXIST  ".\somedir"         mkdir ".\somedir"
         QStringList dirsToClean;
+        QString dirExists = var("QMAKE_CHK_DIR_EXISTS");
+        QString mkdir = var("QMAKE_MKDIR");
         for (QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {
             QStringList values = it.value();
@@ -316 +319 @@
                     QString fixedValue(QDir::toNativeSeparators(values.at(i)));
                     dirsToClean << fixedValue;
-                    t << "\t-@ if NOT EXIST \""  << fixedValue << "\" mkdir \""
-                      << fixedValue << "\"" << endl;
+                    t << "\t-@ " << dirExists << " \""  << fixedValue << "\" "
+                      << (isWindowsShell() ? "" : "|| ")
+                      << mkdir << " \"" << fixedValue << "\"" << endl;
                 }
             }
@@ -326 +330 @@
         //       This is why the "2> NUL" gets appended to generated clean targets in makefile.cpp.
         t << EXTENSION_CLEAN ": " COMPILER_CLEAN_TARGET << endl;
-        generateCleanCommands(t, dirsToClean, var("QMAKE_DEL_DIR"), " /S /Q ", "", "");
+        generateCleanCommands(t, dirsToClean, var("QMAKE_DEL_TREE"), "", "", "");
         t << endl;
 
@@ -375 +379 @@
     writeDeploymentTargets(t, true);
 
-    writeSisTargets(t);
-
-    writeStoreBuildTarget(t);
-
     generateDistcleanTargets(t);
 
@@ -408 +408 @@
     t << endl;
 
-    generateExecutionTargets(t, debugPlatforms);
+    t << "freeze: $(ABLD)" << endl;
+    t << "\t$(ABLD)" << testClause << " freeze" << endl;
+    t << endl;
+
+    // Abld toolchain doesn't differentiate between freezing release or debug
+    t << "freeze-debug: freeze" << endl << endl;
+    t << "freeze-release: freeze" << endl << endl;
+
+    // For more specific builds, targets are in this form: freeze-build-platform, e.g. freeze-release-armv5,
+    // though note that debug and release targets of each platform are identical in symbian-abld.
+    foreach(QString item, debugPlatforms) {
+        t << "freeze-debug-" << item << ": $(ABLD)" << endl;
+        t << "\t$(ABLD)" << testClause << " freeze " << item << endl;
+    }
+    foreach(QString item, releasePlatforms) {
+        t << "freeze-release-" << item << ": $(ABLD)" << endl;
+        t << "\t$(ABLD)" << testClause << " freeze " << item << endl;
+    }
+
+    t << endl;
 }
 
@@ -425 +444 @@
         t << WINSCW_DEPLOYMENT_TARGET ":" << endl;
 
-    QString remoteTestPath = epocRoot()
-        + QLatin1String(isRom ? "epoc32\\data\\z\\private\\" : "epoc32\\winscw\\c\\private\\")
+    QString remoteTestPath = qt_epocRoot()
+        + QDir::toNativeSeparators(QLatin1String(isRom ? "epoc32/data/z/private/"
+                                                       : "epoc32/winscw/c/private/"))
         + privateDirUid;
     DeploymentList depList;
 
-    initProjectDeploySymbian(project, depList, remoteTestPath, false,
+    initProjectDeploySymbian(project, depList, remoteTestPath, false, true,
         QLatin1String(isRom ? ROM_DEPLOYMENT_PLATFORM : EMULATOR_DEPLOYMENT_PLATFORM),
         QString(), generatedDirs, generatedFiles);
@@ -438 +458 @@
 
     for (int i = 0; i < depList.size(); ++i) {
+#ifdef Q_OS_WIN32
         // Xcopy prompts for selecting file or directory if target doesn't exist,
         // and doesn't provide switch to force file selection. It does provide dir forcing, though,
@@ -443 +464 @@
         t << "\t-$(XCOPY) \"" << depList.at(i).from << "\" \""
           << depList.at(i).to.left(depList.at(i).to.lastIndexOf("\\") + 1) << "\"" << endl;
+#else
+        QString dirExists = var("QMAKE_CHK_DIR_EXISTS");
+        QString mkdir = var("QMAKE_MKDIR");
+        QString dir = QFileInfo(depList.at(i).to).dir().path();
+        t << "\t-@ " << dirExists << " \""  << dir << "\" || "
+                      << mkdir << " \"" << dir << "\"" << endl;
+        t << "\t-$(XCOPY) \"" << QDir::toNativeSeparators(depList.at(i).from) << "\" \""
+          << QDir::toNativeSeparators(depList.at(i).to) << "\"" << endl;
+#endif
     }
 
@@ -454 +484 @@
     QStringList cleanList;
     for (int i = 0; i < depList.size(); ++i) {
-        cleanList.append(depList.at(i).to);
+        cleanList.append(QDir::toNativeSeparators(depList.at(i).to));
     }
     generateCleanCommands(t, cleanList, "$(DEL_FILE)", "", "", "");
@@ -464 +494 @@
 
     return true;
-}
-
-void SymbianAbldMakefileGenerator::writeStoreBuildTarget(QTextStream &t)
-{
-    t << STORE_BUILD_TARGET ":" << endl;
-    t << "\t@echo # ============================================================================== > " MAKE_CACHE_NAME << endl;
-    t << "\t@echo # This file is generated by make and should not be modified by the user >> " MAKE_CACHE_NAME << endl;
-    t << "\t@echo #  Name        : " << MAKE_CACHE_NAME << " >> " MAKE_CACHE_NAME << endl;
-    t << "\t@echo #  Part of     : " << project->values("TARGET").join(" ") << " >> " MAKE_CACHE_NAME << endl;
-    t << "\t@echo #  Description : This file is used to cache last build target for >> " MAKE_CACHE_NAME << endl;
-    t << "\t@echo #                make sis target. >> " MAKE_CACHE_NAME << endl;
-    t << "\t@echo #  Version     :  >> " MAKE_CACHE_NAME << endl;
-    t << "\t@echo # >> " MAKE_CACHE_NAME << endl;
-    t << "\t@echo # ============================================================================== >> " MAKE_CACHE_NAME <<  endl;
-    t << "\t@echo. >> " MAKE_CACHE_NAME <<  endl;
-    t << "\t@echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> " MAKE_CACHE_NAME << endl;
-    t << endl;
-
-    generatedFiles << MAKE_CACHE_NAME;
 }
 
@@ -490 +501 @@
     // do not get that, special deployment only makefile is generated for them if needed.
     if (targetType != TypeSubdirs || addDeploymentExtension) {
-        QString gnuMakefileName = QLatin1String("Makefile_") + uid3;
-        removeSpecialCharacters(gnuMakefileName);
-        gnuMakefileName.append(".mk");
+        gnuMakefileName = QLatin1String("Makefile_") + fileInfo(mmpFileName).completeBaseName()
+            + QLatin1String(".mk");
         t << "gnumakefile " << gnuMakefileName << endl;
     }

trunk/qmake/generators/symbian/symmake_abld.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -58 +58 @@
     virtual void appendAbldTempDirs(QStringList& sysincspaths, QString includepath);
 
-    void writeStoreBuildTarget(QTextStream &t);
     bool writeDeploymentTargets(QTextStream &t, bool isRom);
-
+    QString gnuMakefileName;
 public:
 

trunk/qmake/generators/symbian/symmake_sbsv2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -50 +50 @@
 
 // Included from tools/shared
-#include <symbian/epocroot.h>
+#include <symbian/epocroot_p.h>
 
 SymbianSbsv2MakefileGenerator::SymbianSbsv2MakefileGenerator() : SymbianMakefileGenerator() { }
@@ -57 +57 @@
 #define FLM_DEST_DIR "epoc32/tools/makefile_templates/qt"
 #define FLM_SOURCE_DIR "/mkspecs/symbian-sbsv2/flm/qt"
+#define PLATFORM_GCCE "gcce"
+#define PLATFORM_WINSCW "winscw"
+#define PLATFORM_ARM_PREFIX "arm"
+#define BUILD_DEBUG "udeb"
+#define BUILD_RELEASE "urel"
+#define SBS_RVCT_PREFIX "rvct"
+
+static QString winscwPlatform;
+static QString armPlatformPrefix;
+static QString gccePlatform;
+static QString sbsRvctPrefix;
+
+#if defined(Q_OS_UNIX)
+    extern char **environ;
+#endif
+
+static void fixFlmCmd(QString *cmdLine, const QMap<QString, QString> &commandsToReplace)
+{
+    // If commandItem starts with any $$QMAKE_* commands, do a replace for SBS equivalent.
+    // Command replacement is done only for the start of the command or right after
+    // concatenation operators (&& and ||), as otherwise unwanted replacements might occur.
+    static QString cmdFind(QLatin1String("(^|&&\\s*|\\|\\|\\s*)%1"));
+    static QString cmdReplace(QLatin1String("\\1%1"));
+
+    // $$escape_expand(\\n\\t) doesn't work for bld.inf files, but is often used as command
+    // separator, so replace it with "&&" command concatenator.
+    cmdLine->replace("\n\t", "&&");
+
+    // Iterate command replacements in reverse alphabetical order of keys so
+    // that keys which are starts of other longer keys are iterated after longer keys.
+    QMapIterator<QString, QString> cmdIter(commandsToReplace);
+    cmdIter.toBack();
+    while (cmdIter.hasPrevious()) {
+        cmdIter.previous();
+        if (cmdLine->contains(cmdIter.key()))
+            cmdLine->replace(QRegExp(cmdFind.arg(cmdIter.key())), cmdReplace.arg(cmdIter.value()));
+    }
+
+    // Sbsv2 toolchain strips all backslashes (even double ones) from option parameters, so just
+    // assume all backslashes are directory separators and replace them with slashes.
+    // Problem: If some command actually needs backslashes for something else than dir separator,
+    // we are out of luck.
+    cmdLine->replace("\\", "/");
+}
 
 // Copies Qt FLMs to correct location under epocroot.
@@ -68 +112 @@
         QFileInfoList sourceInfos = sourceDir.entryInfoList(QDir::Files);
 
-        QDir destDir(epocRoot() + FLM_DEST_DIR);
+        QDir destDir(qt_epocRoot() + FLM_DEST_DIR);
         if (!destDir.exists()) {
             if (destDir.mkpath(destDir.absolutePath()))
@@ -91 +135 @@
 }
 
+void SymbianSbsv2MakefileGenerator::findInstalledCompilerVersions(const QString &matchExpression,
+                                                                  const QString &versionPrefix,
+                                                                  QStringList *versionList)
+{
+    // No need to be able to find env variables on other operating systems,
+    // as only linux and windows have support for symbian-sbsv2 toolchain
+#if defined(Q_OS_UNIX) || defined(Q_OS_WIN)
+    char *entry = 0;
+    int count = 0;
+    QRegExp matcher(matchExpression);
+    while ((entry = environ[count++])) {
+        if (matcher.exactMatch(QString::fromLocal8Bit(entry))
+            && fileInfo(matcher.cap(matcher.captureCount())).exists()) {
+            // First capture (index 0) is the whole match, which is skipped.
+            // Next n captures are version numbers, which are interesting.
+            // Final capture is the env var value, which we already used, so that is skipped, too.
+            int capture = 1;
+            int finalCapture = matcher.captureCount() - 1;
+            QString version = versionPrefix;
+            while (capture <= finalCapture) {
+                version.append(matcher.cap(capture));
+                if (capture != finalCapture)
+                    version.append(QLatin1Char('.'));
+                capture++;
+            }
+            *versionList << version;
+        }
+    }
+#endif
+}
+
+void SymbianSbsv2MakefileGenerator::findGcceVersions(QStringList *gcceVersionList,
+                                                     QString *defaultVersion)
+{
+    QString matchStr = QLatin1String("SBS_GCCE(\\d)(\\d)(\\d)BIN=(.*)");
+    findInstalledCompilerVersions(matchStr, gccePlatform, gcceVersionList);
+
+    QString qtGcceVersion = QString::fromLocal8Bit(qgetenv("QT_GCCE_VERSION"));
+
+    if (!qtGcceVersion.isEmpty()) {
+        if (QRegExp("\\d+\\.\\d+\\.\\d+").exactMatch(qtGcceVersion)) {
+            *defaultVersion = gccePlatform + qtGcceVersion;
+        } else {
+            fprintf(stderr, "Warning: Variable QT_GCCE_VERSION ('%s') is in incorrect "
+                    "format, expected format is: 'x.y.z'. Attempting to autodetect GCCE version.\n",
+                    qPrintable(qtGcceVersion));
+        }
+    }
+
+    if (defaultVersion->isEmpty() && gcceVersionList->size()) {
+        gcceVersionList->sort();
+        *defaultVersion = gcceVersionList->last();
+    }
+}
+
+void SymbianSbsv2MakefileGenerator::findRvctVersions(QStringList *rvctVersionList,
+                                                     QString *defaultVersion)
+{
+    QString matchStr = QLatin1String("RVCT(\\d)(\\d)BIN=(.*)");
+    findInstalledCompilerVersions(matchStr, sbsRvctPrefix, rvctVersionList);
+
+    QString qtRvctVersion = QString::fromLocal8Bit(qgetenv("QT_RVCT_VERSION"));
+
+    if (!qtRvctVersion.isEmpty()) {
+        if (QRegExp("\\d+\\.\\d+").exactMatch(qtRvctVersion)) {
+            *defaultVersion = sbsRvctPrefix + qtRvctVersion;
+        } else {
+            fprintf(stderr, "Warning: Variable QT_RVCT_VERSION ('%s') is in incorrect "
+                    "format, expected format is: 'x.y'.\n",
+                    qPrintable(qtRvctVersion));
+        }
+    }
+}
+
+QString SymbianSbsv2MakefileGenerator::configClause(const QString &platform,
+                                                    const QString &build,
+                                                    const QString &compilerVersion,
+                                                    const QString &clauseTemplate)
+{
+    QString retval;
+    if (QString::compare(platform, winscwPlatform) == 0) {
+        retval = clauseTemplate.arg(build);
+    } else if (platform.startsWith(armPlatformPrefix)) {
+        QString fixedCompilerVersion = compilerVersion;
+        fixedCompilerVersion.replace(".","_");
+        retval = clauseTemplate.arg(platform.mid(sizeof(PLATFORM_ARM_PREFIX)-1))
+                                  .arg(build)
+                                  .arg(fixedCompilerVersion);
+    } // else - Unsupported platform for makefile target, return empty clause
+    return retval;
+}
+
 void SymbianSbsv2MakefileGenerator::writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t)
 {
@@ -100 +236 @@
         toItem.replace("\\", "/");
 #if defined(Q_OS_WIN)
-        toItem.prepend(QDir::current().absolutePath().left(2)); // add drive
+        // add drive if it doesn't have one yet
+        if (toItem.size() > 1 && toItem[1] != QLatin1Char(':'))
+            toItem.prepend(QDir::current().absolutePath().left(2));
 #endif
         t << "OPTION DEPLOY_SOURCE " << fromItem << endl;
@@ -117 +255 @@
 void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile)
 {
+    static QString debugBuild;
+    static QString releaseBuild;
+    static QString defaultGcceCompilerVersion;
+    static QString defaultRvctCompilerVersion;
+    static QStringList rvctVersions;
+    static QStringList gcceVersions;
+    static QStringList allArmCompilerVersions;
+
+    // Initialize static variables used in makefile creation
+    if (debugBuild.isEmpty()) {
+        debugBuild.append(QLatin1String(BUILD_DEBUG));
+        releaseBuild.append(QLatin1String(BUILD_RELEASE));
+        winscwPlatform.append(QLatin1String(PLATFORM_WINSCW));
+        gccePlatform.append(QLatin1String(PLATFORM_GCCE));
+        armPlatformPrefix.append(QLatin1String(PLATFORM_ARM_PREFIX));
+        sbsRvctPrefix.append(QLatin1String(SBS_RVCT_PREFIX));
+
+        findGcceVersions(&gcceVersions, &defaultGcceCompilerVersion);
+        findRvctVersions(&rvctVersions, &defaultRvctCompilerVersion);
+
+        allArmCompilerVersions << rvctVersions << gcceVersions;
+
+        if (!allArmCompilerVersions.size()) {
+            fprintf(stderr, "Warning: No HW compilers detected. "
+                    "Please install either GCCE or RVCT compiler to enable release builds.\n");
+        }
+    }
+
     QStringList allPlatforms;
     foreach(QString platform, project->values("SYMBIAN_PLATFORMS")) {
@@ -122 +288 @@
     }
 
-    QStringList debugPlatforms = allPlatforms;
-    QStringList releasePlatforms = allPlatforms;
-    releasePlatforms.removeAll("winscw"); // No release for emulator
+    if (!gcceVersions.size())
+        allPlatforms.removeAll(gccePlatform);
 
     QString testClause;
@@ -132 +297 @@
         testClause = QLatin1String("");
 
+    // Note: armClause is used for gcce, too, which has a side effect
+    //       of requiring armv* platform(s) in SYMBIAN_PLATFORMS in order
+    //       to get any compiler version specific targets.
+    QString armClause = " -c " PLATFORM_ARM_PREFIX ".%1.%2.%3" + testClause;
+    QString genericArmClause;
+    if (defaultRvctCompilerVersion.isEmpty()) {
+        // Note: Argument %3 needs to be empty string in this version of clause
+        genericArmClause = " -c " PLATFORM_ARM_PREFIX "%1_%2%3" + testClause;
+    } else {
+        // If defaultRvctCompilerVersion is defined, use specific sbs clause for "generic" clause
+        genericArmClause = armClause;
+    }
+    QString winscwClause = " -c " PLATFORM_WINSCW "_%1.mwccinc" + testClause;;
+
+    QStringList armPlatforms = allPlatforms.filter(QRegExp("^" PLATFORM_ARM_PREFIX));
+
+    if (!allArmCompilerVersions.size()) {
+        foreach (QString item, armPlatforms) {
+            allPlatforms.removeAll(item);
+        }
+        armPlatforms.clear();
+    }
+
+    QStringList allClauses;
+    QStringList debugClauses;
+    QStringList releaseClauses;
+
+    // Only winscw and arm platforms are supported
+    QStringList debugPlatforms = allPlatforms;
+    QStringList releasePlatforms = allPlatforms;
+    releasePlatforms.removeAll(winscwPlatform); // No release for emulator
+
+    if (!releasePlatforms.size()) {
+        fprintf(stderr, "Warning: No valid release platforms in SYMBIAN_PLATFORMS (%s)\n"
+                "Most likely required compiler(s) are not properly installed.\n",
+                qPrintable(project->values("SYMBIAN_PLATFORMS").join(" ")));
+    }
+
+    if (debugPlatforms.contains(winscwPlatform))
+        debugClauses << configClause(winscwPlatform, debugBuild, QString(), winscwClause);
+
+    foreach(QString item, armPlatforms) {
+        // Only use single clause per arm platform even if multiple compiler versions were found,
+        // otherwise we get makefile target collisions from sbsv2 toolchain.
+        if (rvctVersions.size()) {
+            debugClauses << configClause(item, debugBuild, defaultRvctCompilerVersion, genericArmClause);
+            releaseClauses << configClause(item, releaseBuild, defaultRvctCompilerVersion, genericArmClause);
+        } else {
+            debugClauses << configClause(item, debugBuild, defaultGcceCompilerVersion, armClause);
+            releaseClauses << configClause(item, releaseBuild, defaultGcceCompilerVersion, armClause);
+        }
+    }
+
+    allClauses << debugClauses << releaseClauses;
+
     QTextStream t(&wrapperFile);
 
-    t << "# ==============================================================================" << endl;
-    t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-    t << QDateTime::currentDateTime().toString() << endl;
-    t << "# This file is generated by qmake and should not be modified by the" << endl;
-    t << "# user." << endl;
-    t << "#  Name        : " << wrapperFile.fileName() << endl;
-    t << "#  Description : Wrapper Makefile for calling Symbian build tools" << endl;
-    t << "#" << endl;
-    t << "# ==============================================================================" << "\n" << endl;
-    t << endl;
-    t << "MAKEFILE          = " << wrapperFile.fileName() << endl;
-    t << "QMAKE             = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl;
+    MakefileGenerator::writeHeader(t);
+
+    t << "MAKEFILE          = " << fileInfo(wrapperFile.fileName()).fileName() << endl;
+    t << "QMAKE             = " << var("QMAKE_QMAKE") << endl;
     t << "DEL_FILE          = " << var("QMAKE_DEL_FILE") << endl;
     t << "DEL_DIR           = " << var("QMAKE_DEL_DIR") << endl;
@@ -169 +381 @@
         }
     }
+
     t << endl;
-    t << "first: default" << endl;
-    if (debugPlatforms.contains("winscw"))
-        t << "default: debug-winscw";
-    else if (debugPlatforms.contains("armv5"))
-        t << "default: debug-armv5";
-    else if (debugPlatforms.size())
-        t << "default: debug-" << debugPlatforms.first();
-    else
-        t << "default: all";
-
-    t << endl;
+    t << "first: default" << endl << endl;
     if (!isPrimaryMakefile) {
-        t << "all:" << endl;
+        t << "all:" << endl << endl;
+        t << "default: all" << endl << endl;
     } else {
-        t << "all: debug release" << endl;
-        t << endl;
+        t << "all: debug release" << endl << endl;
+        if (debugPlatforms.contains(winscwPlatform))
+            t << "default: debug-winscw";
+        else if (debugPlatforms.size())
+            t << "default: debug-" << debugPlatforms.first();
+        else
+            t << "default: all";
+        t << endl;
+
+        QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs();
+
         t << "qmake:" << endl;
-        t << "\t$(QMAKE) -spec symbian-sbsv2 -o \"" << fileInfo(Option::output.fileName()).fileName()
-          << "\" \"" << project->projectFile() << "\"" << endl;
-        t << endl;
-        t << BLD_INF_FILENAME ":" << endl;
-        t << "\t$(QMAKE)" << endl;
-        t << endl;
-
-        QString winscw("winscw");
-        t << "debug: " << BLD_INF_FILENAME << endl;
+        t << qmakeCmd << endl;
+        t << endl;
+
+        t << BLD_INF_FILENAME ": " << project->projectFile() << endl;
+        t << qmakeCmd << endl;
+        t << endl;
+
+        QString locFileDep = generateLocFileTarget(t, qmakeCmd);
+
+        t << "debug: " << locFileDep << BLD_INF_FILENAME << endl;
         t << "\t$(SBS)";
+        foreach(QString clause, debugClauses) {
+            t << clause;
+        }
+        t << endl;
+        t << "clean-debug: " << BLD_INF_FILENAME << endl;
+        t << "\t$(SBS) reallyclean --toolcheck=off";
+        foreach(QString clause, debugClauses) {
+            t << clause;
+        }
+        t << endl;
+
+        t << "freeze-debug: " << BLD_INF_FILENAME << endl;
+        t << "\t$(SBS) freeze";
+        foreach(QString clause, debugClauses) {
+            t << clause;
+        }
+        t << endl;
+
+        t << "release: " << locFileDep << BLD_INF_FILENAME << endl;
+        t << "\t$(SBS)";
+        foreach(QString clause, releaseClauses) {
+            t << clause;
+        }
+        t << endl;
+        t << "clean-release: " << BLD_INF_FILENAME << endl;
+        t << "\t$(SBS) reallyclean --toolcheck=off";
+        foreach(QString clause, releaseClauses) {
+            t << clause;
+        }
+        t << endl;
+
+        t << "freeze-release: " << BLD_INF_FILENAME << endl;
+        t << "\t$(SBS) freeze";
+        foreach(QString clause, releaseClauses) {
+            t << clause;
+        }
+        t << endl << endl;
+
+        QString defaultGcceArmVersion;
+        if (armPlatforms.size()) {
+            defaultGcceArmVersion = armPlatforms.first();
+        } else {
+            defaultGcceArmVersion = QLatin1String("armv5");
+        }
+
+        // For more specific builds, targets are in this form:
+        // release-armv5 - generic target, compiler version determined by toolchain or autodetection
+        // release-armv5-rvct4.0 - compiler version specific target
         foreach(QString item, debugPlatforms) {
-            if(QString::compare(item, winscw) == 0)
-                t << " -c " << item << "_udeb.mwccinc" << testClause;
-            else
-                t << " -c " << item << "_udeb" << testClause;
-        }
-        t << endl;
-        t << "release: " << BLD_INF_FILENAME << endl;
-        t << "\t$(SBS)";
+            QString clause;
+            if (item.compare(winscwPlatform) == 0)
+                clause = configClause(item, debugBuild, QString(), winscwClause);
+            else if (item.compare(gccePlatform) == 0 )
+                clause = configClause(defaultGcceArmVersion, debugBuild, defaultGcceCompilerVersion, armClause);
+            else // use generic arm clause
+                clause = configClause(item, debugBuild, defaultRvctCompilerVersion, genericArmClause);
+
+            t << "debug-" << item << ": " << locFileDep << BLD_INF_FILENAME << endl;
+            t << "\t$(SBS)" << clause << endl;
+            t << "clean-debug-" << item << ": " << BLD_INF_FILENAME << endl;
+            t << "\t$(SBS) reallyclean" << clause << endl;
+            t << "freeze-debug-" << item << ": " << BLD_INF_FILENAME << endl;
+            t << "\t$(SBS) freeze" << clause << endl;
+        }
+
         foreach(QString item, releasePlatforms) {
-            if(QString::compare(item, winscw) == 0)
-                t << " -c " << item << "_urel.mwccinc" << testClause;
-            else
-                t << " -c " << item << "_urel" << testClause;
-        }
-        t << endl;
-
-        // For more specific builds, targets are in this form: build-platform, e.g. release-armv5
-        foreach(QString item, debugPlatforms) {
-            t << "debug-" << item << ": " << BLD_INF_FILENAME << endl;
-            if(QString::compare(item, winscw) == 0)
-                t << "\t$(SBS) -c " << item << "_udeb.mwccinc" << testClause << endl;
-            else
-                t << "\t$(SBS) -c " << item << "_udeb" << testClause << endl;
-        }
-
-        foreach(QString item, releasePlatforms) {
-            t << "release-" << item << ": " << BLD_INF_FILENAME << endl;
-            if(QString::compare(item, winscw) == 0)
-                t << "\t$(SBS) -c " << item << "_urel.mwccinc" << testClause << endl;
-            else
-                t << "\t$(SBS) -c " << item << "_urel" << testClause << endl;
+            QString clause;
+            if (item.compare(gccePlatform) == 0 )
+                clause = configClause(defaultGcceArmVersion, releaseBuild, defaultGcceCompilerVersion, armClause);
+            else // use generic arm clause
+                clause = configClause(item, releaseBuild, defaultRvctCompilerVersion, genericArmClause);
+
+            t << "release-" << item << ": " << locFileDep << BLD_INF_FILENAME << endl;
+            t << "\t$(SBS)" << clause << endl;
+            t << "clean-release-" << item << ": " << BLD_INF_FILENAME << endl;
+            t << "\t$(SBS) reallyclean" << clause << endl;
+            t << "freeze-release-" << item << ": " << BLD_INF_FILENAME << endl;
+            t << "\t$(SBS) freeze" << clause << endl;
+        }
+
+        foreach(QString item, armPlatforms) {
+            foreach(QString compilerVersion, allArmCompilerVersions) {
+                QString debugClause = configClause(item, debugBuild, compilerVersion, armClause);
+                QString releaseClause = configClause(item, releaseBuild, compilerVersion, armClause);
+                t << "debug-" << item << "-" << compilerVersion << ": " << locFileDep << BLD_INF_FILENAME << endl;
+                t << "\t$(SBS)" << debugClause << endl;
+                t << "clean-debug-" << item << "-" << compilerVersion << ": " << BLD_INF_FILENAME << endl;
+                t << "\t$(SBS) reallyclean" << debugClause << endl;
+                t << "freeze-debug-" << item << "-" << compilerVersion << ": " << BLD_INF_FILENAME << endl;
+                t << "\t$(SBS) freeze" << debugClause << endl;
+                t << "release-" << item << "-" << compilerVersion << ": " << locFileDep << BLD_INF_FILENAME << endl;
+                t << "\t$(SBS)" << releaseClause << endl;
+                t << "clean-release-" << item << "-" << compilerVersion << ": " << BLD_INF_FILENAME << endl;
+                t << "\t$(SBS) reallyclean" << releaseClause << endl;
+                t << "freeze-release-" << item << "-" << compilerVersion << ": " << BLD_INF_FILENAME << endl;
+                t << "\t$(SBS) freeze" << releaseClause << endl;
+            }
         }
 
         t << endl;
         t << "export: " << BLD_INF_FILENAME << endl;
-        t << "\t$(SBS) export" << endl;
-        t << endl;
+        t << "\t$(SBS) export";
+        foreach(QString clause, allClauses) {
+            t << clause;
+        }
+        t << endl << endl;
 
         t << "cleanexport: " << BLD_INF_FILENAME << endl;
-        t << "\t$(SBS) cleanexport" << endl;
-        t << endl;
-
-    }
-
-    // Add all extra targets including extra compiler targest also to wrapper makefile,
+        t << "\t$(SBS) cleanexport";
+        foreach(QString clause, allClauses) {
+            t << clause;
+        }
+        t << endl << endl;
+
+        // Typically one wants to freeze release binaries, so make plain freeze target equal to
+        // freeze-release. If freezing of debug binaries is needed for some reason, then
+        // freeze-debug target should be used. There is no point to try freezing both with one
+        // target as both produce the same def file.
+        t << "freeze: freeze-release" << endl << endl;
+    }
+
+    // Add all extra targets including extra compiler targets also to wrapper makefile,
     // even though many of them may have already been added to bld.inf as FLMs.
     // This is to enable use of targets like 'mocables', which call targets generated by extra compilers.
@@ -254 +544 @@
     }
 
-    writeSisTargets(t);
-
     generateDistcleanTargets(t);
 
+    // Do not check for tools when doing generic clean, as most tools are not actually needed for
+    // cleaning. Mainly this is relevant for environments that do not have winscw compiler.
     t << "clean: " << BLD_INF_FILENAME << endl;
-    t << "\t-$(SBS) reallyclean" << endl;
+    t << "\t-$(SBS) reallyclean --toolcheck=off";
+    foreach(QString clause, allClauses) {
+        t << clause;
+    }
+    t << endl << endl;
+
     t << endl;
-
-    t << "clean-debug: " << BLD_INF_FILENAME << endl;
-    t << "\t$(SBS) reallyclean";
-    foreach(QString item, debugPlatforms) {
-        t << " -c " << item << "_udeb" << testClause;
-    }
-    t << endl;
-    t << "clean-release: " << BLD_INF_FILENAME << endl;
-    t << "\t$(SBS) reallyclean";
-    foreach(QString item, releasePlatforms) {
-        t << " -c " << item << "_urel" << testClause;
-    }
-    t << endl;
-
-    // For more specific builds, targets are in this form: clean-build-platform, e.g. clean-release-armv5
-    foreach(QString item, debugPlatforms) {
-        t << "clean-debug-" << item << ": " << BLD_INF_FILENAME << endl;
-        t << "\t$(SBS) reallyclean -c " << item << "_udeb" << testClause << endl;
-    }
-    foreach(QString item, releasePlatforms) {
-        t << "clean-release-" << item << ": " << BLD_INF_FILENAME << endl;
-        t << "\t$(SBS) reallyclean -c " << item << "_urel" << testClause << endl;
-    }
-    t << endl;
-
-    generateExecutionTargets(t, debugPlatforms);
 }
 
@@ -308 +577 @@
     }
 
+    QMap<QString, QString> commandsToReplace;
+    commandsToReplace.insert(project->values("QMAKE_COPY").join(" "),
+                             project->values("QMAKE_SBSV2_COPY").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_COPY_DIR").join(" "),
+                             project->values("QMAKE_SBSV2_COPY_DIR").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_MOVE").join(" "),
+                             project->values("QMAKE_SBSV2_MOVE").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_DEL_FILE").join(" "),
+                             project->values("QMAKE_SBSV2_DEL_FILE").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_MKDIR").join(" "),
+                             project->values("QMAKE_SBSV2_MKDIR").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_DEL_DIR").join(" "),
+                             project->values("QMAKE_SBSV2_DEL_DIR").join(" "));
+    commandsToReplace.insert(project->values("QMAKE_DEL_TREE").join(" "),
+                             project->values("QMAKE_SBSV2_DEL_TREE").join(" "));
+
     // Write extra compilers and targets to initialize QMAKE_ET_* variables
     // Cache results to avoid duplicate calls when creating wrapper makefile
@@ -319 +604 @@
     QStringList allPreDeps;
     foreach(QString item, project->values("PRE_TARGETDEPS")) {
-        // Predeps get mangled in windows, so fix them to more sbsv2 friendly format
-#if defined(Q_OS_WIN)
-        if (item.mid(1, 1) == ":")
-            item = item.mid(0, 1).toUpper().append(item.mid(1)); // Fix drive to uppercase
-#endif
-        item.replace("\\", "/");
-        allPreDeps << escapeDependencyPath(item);
+        allPreDeps.append(fileInfo(item).absoluteFilePath());
     }
 
@@ -355 +634 @@
                 QString commandItem =  project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_CMD.") + item + targetItem).join(" ");
 
-
                 // Make sure all deps paths are absolute
                 QString absoluteDeps;
@@ -374 +652 @@
                     commandItem.replace("$(DEFINES)", defines.join(" "));
 
-                // Sbsv2 strips all backslashes (even doubles ones) from option parameters, so just replace them with slashes
-                // Problem: If some command actually needs backslashes for something else than dir separator, we are out of luck...
-                commandItem.replace("\\", "/");
+                fixFlmCmd(&commandItem, commandsToReplace);
+
                 t << "OPTION COMMAND " << commandItem << endl;
                 t << "END" << endl;
@@ -386 +663 @@
 
     // Write deployment rules
-    QString remoteTestPath = epocRoot() + QLatin1String("epoc32/winscw/c/private/") + privateDirUid;
+    QString remoteTestPath = qt_epocRoot() + QLatin1String("epoc32/winscw/c/private/") + privateDirUid;
     DeploymentList depList;
 
     //write emulator deployment
     t << "#if defined(WINSCW)" << endl;
-    initProjectDeploySymbian(project, depList, remoteTestPath, false,
+    initProjectDeploySymbian(project, depList, remoteTestPath, false, true,
         QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM), QString(), generatedDirs, generatedFiles);
     writeSbsDeploymentList(depList, t);
@@ -397 +674 @@
 
     //write ROM deployment
-    remoteTestPath = epocRoot() + QLatin1String("epoc32/data/z/private/") + privateDirUid;
+    remoteTestPath = qt_epocRoot() + QLatin1String("epoc32/data/z/private/") + privateDirUid;
     depList.clear();
-    initProjectDeploySymbian(project, depList, remoteTestPath, false,
+    initProjectDeploySymbian(project, depList, remoteTestPath, false, true,
         QLatin1String(ROM_DEPLOYMENT_PLATFORM), QString(), generatedDirs, generatedFiles);
     writeSbsDeploymentList(depList, t);
@@ -406 +683 @@
     // Write post link rules
     if (!project->isEmpty("QMAKE_POST_LINK")) {
+        QString postLinkCmd = var("QMAKE_POST_LINK");
+        fixFlmCmd(&postLinkCmd, commandsToReplace);
         t << "START EXTENSION qt/qmake_post_link" << endl;
-        t << "OPTION POST_LINK_CMD " << var("QMAKE_POST_LINK") << endl;
-        t << "OPTION LINK_TARGET " << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".").append(getTargetExtension())) << endl;
+        t << "OPTION POST_LINK_CMD " << postLinkCmd << endl;
+        t << "OPTION LINK_TARGET " << fixedTarget << QLatin1String(".") << getTargetExtension() << endl;
         t << "END" << endl;
         t << endl;

trunk/qmake/generators/symbian/symmake_sbsv2.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -57 +57 @@
     virtual void writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile);
     virtual void appendAbldTempDirs(QStringList& sysincspaths, QString includepath);
+    virtual bool isForSymbianSbsv2() const { return true; } // FIXME: killme - i'm ugly!
 
 public:
@@ -65 +66 @@
 private:
     void exportFlm();
+    void findGcceVersions(QStringList *gcceVersionList, QString *defaultVersion);
+    void findRvctVersions(QStringList *rvctVersionList, QString *defaultVersion);
+    void findInstalledCompilerVersions(const QString &matchExpression,
+                                       const QString &versionPrefix,
+                                       QStringList *versionList);
+    QString configClause(const QString &platform,
+                         const QString &build,
+                         const QString &compilerVersion,
+                         const QString &clauseTemplate);
+
     void writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t);
 

trunk/qmake/generators/unix/unixmake.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -66 +66 @@
     }
 
+    if (project->isEmpty("QMAKE_PREFIX_SHLIB"))
+        // Prevent crash when using the empty variable.
+        project->values("QMAKE_PREFIX_SHLIB").append("");
+
     if(!project->isEmpty("QMAKE_FAILED_REQUIREMENTS")) /* no point */
         return;
@@ -100 +104 @@
         if(project->isEmpty("MAKEFILE"))
             project->values("MAKEFILE").append("Makefile");
-        if(project->isEmpty("QMAKE_QMAKE"))
-            project->values("QMAKE_QMAKE").append("qmake");
         if(project->values("QMAKE_INTERNAL_QMAKE_DEPS").indexOf("qmake_all") == -1)
             project->values("QMAKE_INTERNAL_QMAKE_DEPS").append("qmake_all");
@@ -452 +454 @@
                         libdirs.append(f);
                 } else if(opt.startsWith("-l")) {
-                    if (project->isActiveConfig("rvct_linker")) {
+                    if (!project->isEmpty("QMAKE_RVCT_LINKSTYLE")) {
+                        (*it) = opt.mid(2);
+                    } else if (project->isActiveConfig("rvct_linker")) {
                         (*it) = "lib" + opt.mid(2) + ".so";
                     } else {
@@ -492 +496 @@
                 if(!extn.isNull())
                     extens << extn;
+                else if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB"))
+                    // In Symbian you link to the stub .lib file, but run with the .dll file.
+                    extens << "lib";
                 else
                     extens << project->values("QMAKE_EXTENSION_SHLIB").first() << "a";
                 for(QStringList::Iterator extit = extens.begin(); extit != extens.end(); ++extit) {
                     if(dir.isNull()) {
-                        QString lib_stub;
                         for(QList<QMakeLocalFileName>::Iterator dep_it = libdirs.begin(); dep_it != libdirs.end(); ++dep_it) {
-                            if(exists((*dep_it).local() + Option::dir_sep + "lib" + stub +
-                                      "." + (*extit))) {
-                                lib_stub = stub;
+                            QString pathToLib = ((*dep_it).local() + Option::dir_sep
+                                    + project->values("QMAKE_PREFIX_SHLIB").first()
+                                    + stub + "." + (*extit));
+                            if(exists(pathToLib)) {
+                                if (!project->isEmpty("QMAKE_RVCT_LINKSTYLE"))
+                                    (*it) = pathToLib;
+                                else
+                                    (*it) = "-l" + stub;
+                                found = true;
                                 break;
                             }
                         }
-                        if(!lib_stub.isNull()) {
-                            (*it) = "-l" + lib_stub;
+                    } else {
+                        if(exists(project->values("QMAKE_PREFIX_SHLIB").first() + stub + "." + (*extit))) {
+                            (*it) = project->values("QMAKE_PREFIX_SHLIB").first() + stub + "." + (*extit);
                             found = true;
                             break;
                         }
-                    } else {
-                        if(exists("lib" + stub + "." + (*extit))) {
-                            (*it) = "lib" + stub + "." + (*extit);
-                            found = true;
-                            break;
-                        }
                     }
                 }
                 if(!found && project->isActiveConfig("compile_libtool")) {
                     for(int dep_i = 0; dep_i < libdirs.size(); ++dep_i) {
-                        if(exists(libdirs[dep_i].local() + Option::dir_sep + "lib" + stub + Option::libtool_ext)) {
-                            (*it) = libdirs[dep_i].real() + Option::dir_sep + "lib" + stub + Option::libtool_ext;
+                        if(exists(libdirs[dep_i].local() + Option::dir_sep + project->values("QMAKE_PREFIX_SHLIB").first() + stub + Option::libtool_ext)) {
+                            (*it) = libdirs[dep_i].real() + Option::dir_sep + project->values("QMAKE_PREFIX_SHLIB").first() + stub + Option::libtool_ext;
                             found = true;
                             break;
@@ -545 +552 @@
     QList<QMakeLocalFileName> libdirs, frameworkdirs;
     frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks"));
-    frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks"));
     const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LFLAGS", "QMAKE_LIBS", QString() };
     for(int i = 0; !lflags[i].isNull(); i++) {
@@ -561 +567 @@
                         const QMakeLocalFileName &lfn = libdirs[dep_i];
                         if(!project->isActiveConfig("compile_libtool")) { //give them the .libs..
-                            QString la = lfn.local() + Option::dir_sep + "lib" + lib + Option::libtool_ext;
+                            QString la = lfn.local() + Option::dir_sep + project->values("QMAKE_PREFIX_SHLIB").first() + lib + Option::libtool_ext;
                             if(exists(la) && QFile::exists(lfn.local() + Option::dir_sep + ".libs")) {
                                 QString dot_libs = lfn.real() + Option::dir_sep + ".libs";
@@ -569 +575 @@
                         }
 
-                        QString prl = lfn.local() + Option::dir_sep + "lib" + lib;
+                        QString prl = lfn.local() + Option::dir_sep + project->values("QMAKE_PREFIX_SHLIB").first() + lib;
                         if(!project->isEmpty("QMAKE_" + lib.toUpper() + "_SUFFIX"))
                             prl += project->first("QMAKE_" + lib.toUpper() + "_SUFFIX");
@@ -617 +623 @@
         //merge them into a logical order
         if(!project->isActiveConfig("no_smart_library_merge") && !project->isActiveConfig("no_lflags_merge")) {
-            QStringList lflags;
+            QHash<QString, QStringList> lflags;
             for(int lit = 0; lit < l.size(); ++lit) {
+                QString arch("default");
                 QString opt = l.at(lit).trimmed();
                 if(opt.startsWith("-")) {
+                    if (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-Xarch")) {
+                        if (opt.length() > 7) {
+                            arch = opt.mid(7);
+                            opt = l.at(++lit);
+                        }
+                    }
+
                     if(opt.startsWith("-L") ||
                        (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F"))) {
-                        if(lit == 0 || l.lastIndexOf(opt, lit-1) == -1)
-                            lflags.append(opt);
-                    } else if(opt.startsWith("-l")) {
-                        if(lit == l.size()-1 || l.indexOf(opt, lit+1) == -1)
-                            lflags.append(opt);
+                        if(!lflags[arch].contains(opt))
+                            lflags[arch].append(opt);
+                    } else if(opt.startsWith("-l") || opt == "-pthread") {
+                        // Make sure we keep the dependency-order of libraries
+                        if (lflags[arch].contains(opt))
+                            lflags[arch].removeAll(opt);
+                        lflags[arch].append(opt);
                     } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) {
                         if(opt.length() > 11)
                             opt = opt.mid(11);
-                        else
+                        else {
                             opt = l.at(++lit);
+                            if (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-Xarch"))
+                                opt = l.at(++lit); // The user has done the right thing and prefixed each part
+                        }
                         bool found = false;
-                        for(int x = lit+1; x < l.size(); ++x) {
-                            QString xf = l.at(x);
+                        for(int x = 0; x < lflags[arch].size(); ++x) {
+                            QString xf = lflags[arch].at(x);
                             if(xf.startsWith("-framework")) {
                                 QString framework;
@@ -641 +660 @@
                                     framework = xf.mid(11);
                                 else
-                                    framework = l.at(++x);
+                                    framework = lflags[arch].at(++x);
                                 if(framework == opt) {
                                     found = true;
@@ -649 +668 @@
                         }
                         if(!found) {
-                            lflags.append("-framework");
-                            lflags.append(opt);
+                            lflags[arch].append("-framework");
+                            lflags[arch].append(opt);
                         }
                     } else {
-                        lflags.append(opt);
+                        lflags[arch].append(opt);
                     }
                 } else if(!opt.isNull()) {
-                    if(lit == 0 || l.lastIndexOf(opt, lit-1) == -1)
-                        lflags.append(opt);
-                }
-            }
-            l = lflags;
+                    if(!lflags[arch].contains(opt))
+                        lflags[arch].append(opt);
+                }
+            }
+
+            l =  lflags.take("default");
+
+            // Process architecture specific options (Xarch)
+            QHash<QString, QStringList>::const_iterator archIterator = lflags.constBegin();
+            while (archIterator != lflags.constEnd()) {
+                const QStringList archOptions = archIterator.value();
+                for (int i = 0; i < archOptions.size(); ++i) {
+                    l.append(QLatin1String("-Xarch_") + archIterator.key());
+                    l.append(archOptions.at(i));
+                }
+                ++archIterator;
+            }
         }
     }
@@ -780 +811 @@
         if(!links.isEmpty()) {
             for(int i = 0; i < links.size(); ++i) {
-                if(Option::target_mode == Option::TARG_WIN_MODE ||
-                   Option::target_mode == Option::TARG_OS2_MODE ||
-                   Option::target_mode == Option::TARG_MAC9_MODE) {
-                } else if(Option::target_mode == Option::TARG_UNIX_MODE ||
-                          Option::target_mode == Option::TARG_MACX_MODE) {
+                if(Option::target_mode == Option::TARG_UNIX_MODE ||
+                   Option::target_mode == Option::TARG_MACX_MODE) {
                     QString link = Option::fixPathToTargetOS(destdir + links[i], false);
                     int lslash = link.lastIndexOf(Option::dir_sep);

trunk/qmake/generators/unix/unixmake.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -50 +50 @@
 {
     bool init_flag, include_deps;
-    bool writeMakefile(QTextStream &);
     QString libtoolFileName(bool fixify=true);
     void writeLibtoolFile();     // for libtool
@@ -76 +75 @@
 
     void writeMakeParts(QTextStream &);
+    bool writeMakefile(QTextStream &);
 
 private:

trunk/qmake/generators/unix/unixmake2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -82 +82 @@
     writeHeader(t);
     if(!project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty()) {
-        t << "QMAKE    = "        << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
+        t << "QMAKE    = " << var("QMAKE_QMAKE") << endl;
         QStringList &qut = project->values("QMAKE_EXTRA_TARGETS");
         for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
@@ -149 +149 @@
         t << "LINK          = " << var("QMAKE_LINK") << endl;
         t << "LFLAGS        = " << var("QMAKE_LFLAGS") << endl;
-        t << "LIBS          = " << "$(SUBLIBS) " << var("QMAKE_FRAMEWORKDIR_FLAGS") << " "
+        t << "LIBS          = " << "$(SUBLIBS) " << var("QMAKE_FRAMEWORKPATH_FLAGS") << " "
           << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl;
     }
@@ -155 +155 @@
     t << "AR            = " << var("QMAKE_AR") << endl;
     t << "RANLIB        = " << var("QMAKE_RANLIB") << endl;
-    t << "QMAKE         = " << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
+    t << "QMAKE         = " << var("QMAKE_QMAKE") << endl;
     t << "TAR           = " << var("QMAKE_TAR") << endl;
     t << "COMPRESS      = " << var("QMAKE_GZIP") << endl;
@@ -178 +178 @@
         t << "export MACOSX_DEPLOYMENT_TARGET = " //exported to children processes
           << project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET") << endl;
+
+    if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) {
+        t << "vpath %.dso " << project->values("QMAKE_LIBDIR").join(":") << endl;
+        t << "vpath %.lib " << project->values("QMAKE_LIBDIR").join(":") << endl;
+    }
+
     t << endl;
 
@@ -234 +240 @@
             t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y")) << endl;
             t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
+        } else if(!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) {
+            t << "TARGETD       = " << escapeFilePath(var("TARGET")) << endl;
         } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
             t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
@@ -333 +341 @@
         QStringList &l = project->values("SUBLIBS");
         for(QStringList::Iterator it = l.begin(); it != l.end(); ++it)
-            t << libdir << "lib" << (*it) << ".a ";
+            t << libdir << project->first("QMAKE_PREFIX_STATICLIB") << (*it) << "."
+              << project->first("QMAKE_EXTENSION_STATICLIB") << " ";
         t << endl << endl;
     }
@@ -543 +552 @@
               << varGlue("QMAKE_LN_SHLIB","-"," ", " " + project->first("QMAKE_FRAMEWORK_VERSION") +
                          " " + destdir + "Versions/Current") << "\n\t";
+            if(!project->isEmpty("QMAKE_POST_LINK"))
+                t << "\n\t" << var("QMAKE_POST_LINK");
+            t << endl << endl;
+        } else if(!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) {
+            t << "\n\t"
+              << "-$(DEL_FILE) $(TARGET)" << "\n\t"
+              << var("QMAKE_LINK_SHLIB_CMD");
+            if(!destdir.isEmpty())
+                t << "\n\t"
+                  << "-$(DEL_FILE) " << destdir << "$(TARGET)\n\t"
+                  << "-$(MOVE) $(TARGET) " << destdir;
             if(!project->isEmpty("QMAKE_POST_LINK"))
                 t << "\n\t" << var("QMAKE_POST_LINK");
@@ -861 +881 @@
         QStringList &l = project->values("SUBLIBS");
         for(it = l.begin(); it != l.end(); ++it)
-            t << libdir << "lib" << (*it) << ".a" << ":\n\t"
+            t << libdir << project->first("QMAKE_PREFIX_STATICLIB") << (*it) << "."
+              << project->first("QMAKE_EXTENSION_STATICLIB") << ":\n\t"
               << var(QString("MAKELIB") + (*it)) << endl << endl;
     }
@@ -876 +897 @@
     } else if(!project->isActiveConfig("staticlib") && project->values("QMAKE_APP_FLAG").isEmpty() &&
        !project->isActiveConfig("plugin")) {
-        t << "\t-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << endl
-          << "\t-$(DEL_FILE) " << destdir << "$(TARGET0) " << destdir << "$(TARGET1) "
-          << destdir << "$(TARGET2) $(TARGETA)" << endl;
+        t << "\t-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << endl;
+        if (project->values("QMAKE_SYMBIAN_SHLIB").isEmpty())
+            t << "\t-$(DEL_FILE) " << destdir << "$(TARGET0) " << destdir << "$(TARGET1) "
+              << destdir << "$(TARGET2) $(TARGETA)" << endl;
     } else {
         t << "\t-$(DEL_FILE) " << "$(TARGET)" << " " << endl;
@@ -993 +1015 @@
             project->values("TARGET_EXT").append(".exe");
     } else if (project->isActiveConfig("staticlib")) {
-        project->values("TARGET").first().prepend("lib");
-        project->values("TARGET").first() += ".a";
+        project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB"));
+        project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB");
         if(project->values("QMAKE_AR_CMD").isEmpty())
             project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)");
     } else {
-        project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
+        project->values("TARGETA").append(project->first("DESTDIR") + project->first("QMAKE_PREFIX_STATICLIB")
+                + project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
         if(project->isActiveConfig("compile_libtool"))
             project->values("TARGET_la") = QStringList(project->first("DESTDIR") + "lib" + project->first("TARGET") + Option::libtool_ext);
@@ -1046 +1069 @@
             project->values("TARGET") = project->values("TARGET_x");
         } else if (!project->isEmpty("QMAKE_AIX_SHLIB")) {
-            project->values("TARGET_").append("lib" + project->first("TARGET") + ".a");
+            project->values("TARGET_").append(project->first("QMAKE_PREFIX_STATICLIB") + project->first("TARGET")
+                    + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
             if(project->isActiveConfig("lib_version_first")) {
                 project->values("TARGET_x").append("lib" + project->first("TARGET") + "." +
@@ -1075 +1099 @@
             }
             project->values("TARGET") = project->values("TARGET_x.y.z");
+        } else if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) {
+            project->values("TARGET_").append(project->first("TARGET") + "." +
+                                                   project->first("QMAKE_EXTENSION_SHLIB"));
+            project->values("TARGET") = project->values("TARGET_");
         } else {
             project->values("TARGET_").append("lib" + project->first("TARGET") + "." +

trunk/qmake/generators/win32/borland_bmake.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -116 +116 @@
         if(project->values("MAKEFILE").isEmpty())
             project->values("MAKEFILE").append("Makefile");
-        if(project->values("QMAKE_QMAKE").isEmpty())
-            project->values("QMAKE_QMAKE").append("qmake");
         return;
     }

trunk/qmake/generators/win32/borland_bmake.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/generators/win32/mingw_make.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -144 +144 @@
        project->first("TEMPLATE") == "lib") {
         if(Option::mkfile::do_stub_makefile) {
-            t << "QMAKE    = "        << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
+            t << "QMAKE    = " << var("QMAKE_QMAKE") << endl;
             QStringList &qut = project->values("QMAKE_EXTRA_TARGETS");
             for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
@@ -192 +192 @@
         t << "CREATE " << target << endl;
         for (QStringList::ConstIterator it = objList.constBegin(); it != objList.constEnd(); ++it) {
-            if (QDir::isRelativePath(*it))
-                t << "ADDMOD " << *it << endl;
-            else
-                t << *it << endl;
+            t << "ADDMOD " << *it << endl;
         }
         t << "SAVE" << endl;
@@ -249 +246 @@
         if(project->values("MAKEFILE").isEmpty())
             project->values("MAKEFILE").append("Makefile");
-        if(project->values("QMAKE_QMAKE").isEmpty())
-            project->values("QMAKE_QMAKE").append("qmake");
         return;
     }
@@ -374 +369 @@
         }
         createArObjectScriptFile(ar_script_file, var("DEST_TARGET"), project->values("OBJECTS"));
-        objectsLinkLine = "ar -M < " + ar_script_file;
+        // QMAKE_LIB is used for win32, including mingw, whereas QMAKE_AR is used on Unix.
+        // Strip off any options since the ar commands will be read from file.
+        QString ar_cmd = var("QMAKE_LIB").section(" ", 0, 0);;
+        if (ar_cmd.isEmpty())
+            ar_cmd = "ar";
+        objectsLinkLine = ar_cmd + " -M < " + ar_script_file;
     } else {
         QString ld_script_file = var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("TARGET");
@@ -418 +418 @@
         t << escapeDependencyPath(var("RES_FILE")) << ": " << rc_file << "\n\t"
           << var("QMAKE_RC") << " -i " << rc_file << " -o " << var("RES_FILE") 
-          << " --include-dir=" << incPathStr << endl << endl;
+          << " --include-dir=" << incPathStr << " $(DEFINES)" << endl << endl;
     }
 }

trunk/qmake/generators/win32/mingw_make.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/generators/win32/msvc_nmake.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -157 +157 @@
         if(project->values("MAKEFILE").isEmpty())
             project->values("MAKEFILE").append("Makefile");
-        if(project->values("QMAKE_QMAKE").isEmpty())
-            project->values("QMAKE_QMAKE").append("qmake");
         if(project->isEmpty("QMAKE_COPY_FILE"))
             project->values("QMAKE_COPY_FILE").append("$(COPY)");
@@ -216 +214 @@
     }
     if(project->isActiveConfig("debug")) {
-        project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb");
+        project->values("QMAKE_DISTCLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb");
         project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk");
         project->values("QMAKE_CLEAN").append("vc*.pdb");
@@ -313 +311 @@
     }
     if(!project->isEmpty("QMAKE_POST_LINK")) {
-        if (useSignature)
-            t << " && " << var("QMAKE_POST_LINK");
-        else
-            t << "\n\t" << var("QMAKE_POST_LINK");
+        t << "\n\t" << var("QMAKE_POST_LINK");
     }
     t << endl;

trunk/qmake/generators/win32/msvc_nmake.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/generators/win32/msvc_objectmodel.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -42 +42 @@
 #include "msvc_objectmodel.h"
 #include "msvc_vcproj.h"
+#include "msvc_vcxproj.h"
 #include <qstringlist.h>
 #include <qfileinfo.h>
@@ -280 +281 @@
 }
 
+// VCToolBase -------------------------------------------------
+QStringList VCToolBase::fixCommandLine(const QString &input)
+{
+    // The splitting regexp is a bit bizarre for backwards compat reasons (why else ...).
+    return input.split(QRegExp(QLatin1String("\n\t|\r\\\\h|\r\n")));
+}
+
+static QString vcCommandSeparator()
+{
+    // MSVC transforms the build tree into a single batch file, simply pasting the contents
+    // of the custom commands into it, and putting an "if errorlevel goto" statement behind it.
+    // As we want every sub-command to be error-checked (as is done by makefile-based
+    // backends), we insert the checks ourselves, using the undocumented jump target.
+    static QString cmdSep =
+            QLatin1String("&#x000D;&#x000A;if errorlevel 1 goto VCReportError&#x000D;&#x000A;");
+    return cmdSep;
+}
+
 // VCCLCompilerTool -------------------------------------------------
 VCCLCompilerTool::VCCLCompilerTool()
@@ -673 +692 @@
             if(third == 'd')
                 RuntimeLibrary = rtMultiThreadedDebug;
+            break;
+        } else if (second == 'P') {
+            if (config->CompilerVersion >= NET2005)
+                AdditionalOptions += option;
+            else
+                warn_msg(WarnLogic, "/MP option is not supported in Visual C++ < 2005, ignoring.");
             break;
         }
@@ -1424 +1449 @@
     case 0x0034160: // /MAP[:filename]
         GenerateMapFile = _True;
-        MapFileName = option+5;
+        if (option[4] == ':')
+            MapFileName = option+5;
         break;
     case 0x164e1ef: // /MAPINFO:{EXPORTS|LINES}
@@ -1906 +1932 @@
 XmlOutput &operator<<(XmlOutput &xml, const VCCustomBuildTool &tool)
 {
-    // The code below offers two ways to split custom build step commands.
-    // Normally the $$escape_expand(\n\t) is used in a project file, which is correctly translated
-    // in all generators. However, if you use $$escape_expand(\n\r) (or \n\h) instead, the VCPROJ
-    // generator will instead of binding the commands with " && " will insert a proper newline into
-    // the VCPROJ file. We sometimes use this method of splitting commands if the custom buildstep
-    // contains a command-line which is too big to run on certain OS.
-    QString cmds;
-    int end = tool.CommandLine.count();
-    for(int i = 0; i < end; ++i) {
-        QString cmdl = tool.CommandLine.at(i);
-        if (cmdl.contains("\r\t")) {
-            if (i == end - 1)
-                cmdl = cmdl.trimmed();
-            cmdl.replace("\r\t", " && ");
-        } else if (cmdl.contains("\r\n")) {
-            ;
-        } else if (cmdl.contains("\r\\h")) {
-            // The above \r\n should work, but doesn't, so we have this hack
-            cmdl.replace("\r\\h", "\r\n");
-        } else {
-            if (i < end - 1)
-                cmdl += " && ";
-        }
-        cmds += cmdl;
-    }
     return xml
         << tag(_Tool)
             << attrS(_Name, tool.ToolName)
             << attrX(_AdditionalDependencies, tool.AdditionalDependencies, ";")
-            << attrS(_CommandLine, cmds)
+            << attrS(_CommandLine, tool.CommandLine.join(vcCommandSeparator()))
             << attrS(_Description, tool.Description)
             << attrX(_Outputs, tool.Outputs, ";")
@@ -1995 +1996 @@
             << attrS(_Name, tool.ToolName)
             << attrS(_Path, tool.ToolPath)
-            << attrS(_CommandLine, tool.CommandLine)
+            << attrS(_CommandLine, tool.CommandLine.join(vcCommandSeparator()))
             << attrS(_Description, tool.Description)
             << attrT(_ExcludedFromBuild, tool.ExcludedFromBuild)
@@ -2289 +2290 @@
             CustomBuildTool.Description += " & ";
         CustomBuildTool.Description += cmd_name;
-        CustomBuildTool.CommandLine += cmd.trimmed().split("\n", QString::SkipEmptyParts);
+        CustomBuildTool.CommandLine += VCToolBase::fixCommandLine(cmd.trimmed());
         int space = cmd.indexOf(' ');
         QFileInfo finf(cmd.left(space));

trunk/qmake/generators/win32/msvc_objectmodel.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -59 +59 @@
     NET2003 = 0x71,
     NET2005 = 0x80,
-    NET2008 = 0x90
+    NET2008 = 0x90,
+    NET2010 = 0xa0
 };
 
@@ -475 +476 @@
             parseOption((*it).toLatin1());
     }
+    static QStringList fixCommandLine(const QString &input);
 };
 
@@ -746 +748 @@
 public:
     // Variables
-    QString                 CommandLine;
+    QStringList             CommandLine;
     QString                 Description;
     triState                ExcludedFromBuild;
@@ -868 +870 @@
     customBuildCheck        CustomBuild;
 
-    bool                    useCustomBuildTool;
+    bool                    useCustomBuildTool;
     VCCustomBuildTool       CustomBuildTool;
 

trunk/qmake/generators/win32/msvc_vcproj.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -68 +68 @@
 #ifdef Q_OS_WIN32
 #include <qt_windows.h>
-#include <windows/registry.h>
+#include <windows/registry_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -78 +78 @@
 } dotNetCombo[] = {
 #ifdef Q_OS_WIN64
+    {NET2010, "MSVC.NET 2010 (10.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\10.0\\Setup\\VC\\ProductDir"},
+    {NET2010, "MSVC.NET 2010 Express Edition (10.0)", "Software\\Wow6432Node\\Microsoft\\VCExpress\\10.0\\Setup\\VC\\ProductDir"},
     {NET2008, "MSVC.NET 2008 (9.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\9.0\\Setup\\VC\\ProductDir"},
     {NET2008, "MSVC.NET 2008 Express Edition (9.0)", "Software\\Wow6432Node\\Microsoft\\VCExpress\\9.0\\Setup\\VC\\ProductDir"},
@@ -85 +87 @@
     {NET2002, "MSVC.NET 2002 (7.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\7.0\\Setup\\VC\\ProductDir"},
 #else
+    {NET2010, "MSVC.NET 2010 (10.0)", "Software\\Microsoft\\VisualStudio\\10.0\\Setup\\VC\\ProductDir"},
+    {NET2010, "MSVC.NET 2010 Express Edition (10.0)", "Software\\Microsoft\\VCExpress\\10.0\\Setup\\VC\\ProductDir"},
     {NET2008, "MSVC.NET 2008 (9.0)", "Software\\Microsoft\\VisualStudio\\9.0\\Setup\\VC\\ProductDir"},
     {NET2008, "MSVC.NET 2008 Express Edition (9.0)", "Software\\Microsoft\\VCExpress\\9.0\\Setup\\VC\\ProductDir"},
@@ -116 +120 @@
     int i = 0;
     for(; dotNetCombo[i].version; ++i) {
-        QString path = readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey);
+        QString path = qt_readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey);
         if(!path.isEmpty()) {
             ++installed;
@@ -133 +137 @@
     i = installed = 0;
     for(; dotNetCombo[i].version; ++i) {
-        QString productPath = readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey).toLower();
+        QString productPath = qt_readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey).toLower();
                 if (productPath.isEmpty())
                         continue;
@@ -166 +170 @@
 const char _slnHeader70[]       = "Microsoft Visual Studio Solution File, Format Version 7.00";
 const char _slnHeader71[]       = "Microsoft Visual Studio Solution File, Format Version 8.00";
-const char _slnHeader80[]       = "Microsoft Visual Studio Solution File, Format Version 9.00";
-const char _slnHeader90[]       = "Microsoft Visual Studio Solution File, Format Version 10.00";
+const char _slnHeader80[]       = "Microsoft Visual Studio Solution File, Format Version 9.00"
+                                  "\n# Visual Studio 2005";
+const char _slnHeader90[]       = "Microsoft Visual Studio Solution File, Format Version 10.00"
+                                  "\n# Visual Studio 2008";
+const char _slnHeader100[]      = "Microsoft Visual Studio Solution File, Format Version 11.00"
+                                  "\n# Visual Studio 2010";
                                   // The following UUID _may_ change for later servicepacks...
                                   // If so we need to search through the registry at
@@ -355 +363 @@
 
     switch(which_dotnet_version()) {
+    case NET2010:
+        t << _slnHeader100;
+        break;
     case NET2008:
         t << _slnHeader90;
@@ -890 +901 @@
     conf.compiler.ProgramDataBaseFileName = ".\\" ;
     conf.compiler.ObjectFile = placement ;
+    conf.compiler.ExceptionHandling = ehNone;
     // PCH
     if (usePCH) {
@@ -907 +919 @@
     if(project->isActiveConfig("debug")){
         // Debug version
-        conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_DEBUG"));
         if((projectTarget == Application) || (projectTarget == StaticLib))
             conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DBG"));
@@ -914 +925 @@
     } else {
         // Release version
-        conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_RELEASE"));
         conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
         conf.compiler.PreprocessorDefinitions += "NDEBUG";
@@ -924 +934 @@
 
     // Common for both release and debug
-    if(project->isActiveConfig("warn_off"))
-        conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_WARN_OFF"));
-    else if(project->isActiveConfig("warn_on"))
-        conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_WARN_ON"));
     if(project->isActiveConfig("windows"))
         conf.compiler.PreprocessorDefinitions += project->values("MSVCPROJ_WINCONDEF");
@@ -990 +996 @@
     conf.linker.OutputFile += project->first("MSVCPROJ_TARGET");
 
-    if(project->isActiveConfig("debug")){
-        conf.linker.parseOptions(project->values("QMAKE_LFLAGS_DEBUG"));
-    } else {
-        conf.linker.parseOptions(project->values("QMAKE_LFLAGS_RELEASE"));
-    }
-
     if(project->isActiveConfig("dll")){
         conf.linker.parseOptions(project->values("QMAKE_LFLAGS_QT_DLL"));
     }
-
-    if(project->isActiveConfig("console")){
-        conf.linker.parseOptions(project->values("QMAKE_LFLAGS_CONSOLE"));
-    } else {
-        conf.linker.parseOptions(project->values("QMAKE_LFLAGS_WINDOWS"));
-    }
-
 }
 
@@ -1035 +1028 @@
 }
 
-QString VcprojGenerator::fixCommandLine(DotNET version, const QString &input) const
-{
-    QString result = input;
-
-    if (version >= NET2005)
-        result = result.replace(QLatin1Char('\n'), QLatin1String("&#x000D;&#x000A;"));
-
-    return result;
-}
-
 void VcprojGenerator::initPostBuildEventTools()
 {
     VCConfiguration &conf = vcProject.Configuration;
     if(!project->values("QMAKE_POST_LINK").isEmpty()) {
-        QString cmdline = fixCommandLine(conf.CompilerVersion, var("QMAKE_POST_LINK"));
+        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_POST_LINK"));
         conf.postBuild.CommandLine = cmdline;
-        if (conf.CompilerVersion < NET2005)
-            cmdline = cmdline.replace("\n", "&&");
-        conf.postBuild.Description = cmdline;
+        conf.postBuild.Description = cmdline.join(QLatin1String("\r\n"));
     }
 
@@ -1060 +1041 @@
                         !project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH");
     if(useSignature)
-        conf.postBuild.CommandLine.prepend(QLatin1String("signtool sign /F ") + signature + " \"$(TargetPath)\"\n" +
-            (!conf.postBuild.CommandLine.isEmpty() ? " && " : ""));
+        conf.postBuild.CommandLine.prepend(
+                QLatin1String("signtool sign /F ") + signature + QLatin1String(" \"$(TargetPath)\""));
 
     if(!project->values("MSVCPROJ_COPY_DLL").isEmpty()) {
-        if(!conf.postBuild.CommandLine.isEmpty())
-            conf.postBuild.CommandLine += " && ";
         conf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC");
         conf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL");
@@ -1194 +1173 @@
     VCConfiguration &conf = vcProject.Configuration;
     if(!project->values("QMAKE_PRE_LINK").isEmpty()) {
-        QString cmdline = fixCommandLine(conf.CompilerVersion, var("QMAKE_PRE_LINK"));
-        conf.preLink.Description = cmdline;
+        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_PRE_LINK"));
         conf.preLink.CommandLine = cmdline;
+        conf.preLink.Description = cmdline.join(QLatin1String("\r\n"));
     }
 }
@@ -1609 +1588 @@
         ofile = ofile.replace('-', '_');
     } else {
-        int hypenfind = ofile.indexOf('-', slashfind);
-        while (hypenfind != -1 && slashfind < hypenfind) {
-            ofile = ofile.replace(hypenfind, 1, '_');
-            hypenfind = ofile.indexOf('-', hypenfind + 1);
+        int hyphenfind = ofile.indexOf('-', slashfind);
+        while (hyphenfind != -1 && slashfind < hyphenfind) {
+            ofile = ofile.replace(hyphenfind, 1, '_');
+            hyphenfind = ofile.indexOf('-', hyphenfind + 1);
         }
     }
@@ -1627 +1606 @@
        !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::DataPath) + "/win32-msvc2003/" + file))) &&
        !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::DataPath) + "/win32-msvc2005/" + file))) &&
-       !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::DataPath) + "/win32-msvc2008/" + file))) &&
-       !exists((ret = (QString(qgetenv("HOME")) + "/.tmake/" + file))))
+       !exists((ret = QString(QLibraryInfo::location(QLibraryInfo::DataPath) + "/win32-msvc2008/" + file))))
         return "";
     debug_msg(1, "Generator: MSVC.NET: Found template \'%s\'", ret.toLatin1().constData());

trunk/qmake/generators/win32/msvc_vcproj.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -62 +62 @@
     bool writeMakefile(QTextStream &);
     bool writeProjectMakefile();
-    void writeSubDirs(QTextStream &t);
 
     QString findTemplate(QString file);
@@ -120 +119 @@
     void initExtraCompilerOutputs();
 
+    void writeSubDirs(QTextStream &t); // Called from VCXProj backend
+    QUuid getProjectUUID(const QString &filename=QString()); // Called from VCXProj backend
+
     Target projectTarget;
 
@@ -129 +131 @@
 
 private:
-    QString fixCommandLine(DotNET version, const QString &input) const;
-    QUuid getProjectUUID(const QString &filename=QString());
     QUuid increaseUUID(const QUuid &id);
     friend class VCFilter;

trunk/qmake/generators/win32/winmakefile.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -473 +473 @@
         project->values("RES_FILE").prepend(fileInfo(resFile).fileName());
         if (!project->values("OBJECTS_DIR").isEmpty()) {
-            if(project->isActiveConfig("staticlib"))
-                project->values("RES_FILE").first().prepend(fileInfo(project->values("DESTDIR").first()).absoluteFilePath() + Option::dir_sep);
+            QString resDestDir;
+            if (project->isActiveConfig("staticlib"))
+                resDestDir = fileInfo(project->first("DESTDIR")).absoluteFilePath();
             else
-              project->values("RES_FILE").first().prepend(project->values("OBJECTS_DIR").first() + Option::dir_sep);
+                resDestDir = project->first("OBJECTS_DIR");
+            resDestDir.append(Option::dir_sep);
+            project->values("RES_FILE").first().prepend(resDestDir);
         }
         project->values("RES_FILE").first() = Option::fixPathToTargetOS(project->values("RES_FILE").first(), false, false);
@@ -605 +608 @@
     writeLibsPart(t);
 
-    t << "QMAKE         = " << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") :
-                              Option::fixPathToTargetOS(var("QMAKE_QMAKE"), false)) << endl;
+    t << "QMAKE         = " << var("QMAKE_QMAKE") << endl;
     t << "IDC           = " << (project->isEmpty("QMAKE_IDC") ? QString("idc") :
                               Option::fixPathToTargetOS(var("QMAKE_IDC"), false)) << endl;
@@ -658 +660 @@
     t << "DIST          = " << varList("DISTFILES") << endl;
     t << "QMAKE_TARGET  = " << var("QMAKE_ORIG_TARGET") << endl;
-    // The comment is important to maintain variable compatability with Unix
+    // The comment is important to maintain variable compatibility with Unix
     // Makefiles, while not interpreting a trailing-slash as a linebreak
     t << "DESTDIR        = " << escapeFilePath(destDir) << " #avoid trailing-slash linebreak" << endl;
@@ -789 +791 @@
         target = project->first("TARGET");
     return QString(target + project->first("TARGET_VERSION_EXT") + ".lib");
+}
+
+QString Win32MakefileGenerator::getPdbTarget()
+{
+    return QString(project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".pdb");
 }
 
@@ -841 +848 @@
             uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"" + del_suffix);
         }
+        if(project->isActiveConfig("shared") && project->isActiveConfig("debug")) {
+            QString pdb_target = getPdbTarget();
+            pdb_target.remove('"');
+            QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target;
+            QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute));
+            if(!ret.isEmpty())
+                ret += "\n\t";
+            ret += QString("-$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";
+            if(!uninst.isEmpty())
+                uninst.append("\n\t");
+            uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
+        }
     }
 

trunk/qmake/generators/win32/winmakefile.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -85 +85 @@
     virtual void processFileTagsVar();
     virtual QString getLibTarget();
+    virtual QString getPdbTarget();
 };
 

trunk/qmake/generators/xmloutput.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -80 +80 @@
 {
     currentState = state;
+}
+
+void XmlOutput::setFormat(XMLFormat newFormat)
+{
+    format = newFormat;
 }
 
@@ -173 +178 @@
         newTagOpen(o.xo_text);
         break;
+    case tTagValue:
+        addRaw(QString("\n%1<%2>").arg(currentIndent).arg(o.xo_text));
+        addRaw(QString("%1").arg(o.xo_value));
+        addRaw(QString("</%1>").arg(o.xo_text));
+        break;
+    case tValueTag:
+        addRaw(QString("%1").arg(doConversion(o.xo_text)));
+        setFormat(NoNewLine);
+        closeTag();
+        setFormat(NewLine);
+        break;
+    case tImport:
+        addRaw(QString("\n%1<Import %2=\"%3\" />").arg(currentIndent).arg(o.xo_text).arg(o.xo_value));
+        break;
     case tCloseTag:
         if (o.xo_value.count())
@@ -183 +202 @@
     case tAttribute:
         addAttribute(o.xo_text, o.xo_value);
+        break;
+    case tAttributeTag:
+        addAttributeTag(o.xo_text, o.xo_value);
         break;
     case tData:
@@ -267 +289 @@
             break;
         case Attribute:
-            xmlFile << "/>";
+            xmlFile << " />";
             tagStack.pop_back();
             currentState = Tag;
@@ -308 +330 @@
             return;
     }
-    QString outData = QString("<?xml version=\"%1\" encoding = \"%2\"?>")
+    QString outData = QString("<?xml version=\"%1\" encoding=\"%2\"?>")
                               .arg(doConversion(version))
                               .arg(doConversion(encoding));
@@ -338 +360 @@
 }
 
+void XmlOutput::addAttributeTag(const QString &attribute, const QString &value)
+{
+     switch(currentState) {
+        case Bare:
+        case Tag:
+            //warn_msg(WarnLogic, "<%s>: Cannot add attribute since tags not open", tagStack.last().toLatin1().constData());
+            qDebug("<%s>: Cannot add attribute (%s) since tag's not open",
+                   (tagStack.count() ? tagStack.last().toLatin1().constData() : "Root"),
+                   attribute.toLatin1().constData());
+            return;
+        case Attribute:
+            break;
+    }
+    xmlFile << " " << doConversion(attribute) << "=\"" << doConversion(value) << "\"";
+}
+
 QT_END_NAMESPACE

trunk/qmake/generators/xmloutput.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -70 +70 @@
         tDeclaration,       // <?xml version="x.x" encoding="xxx"?>
         tTag,               // <tagname attribute1="value"
+        tTagValue,          // <tagname>value</tagname>
+        tValueTag,          // value</tagname>
         tCloseTag,          // Closes an open tag
         tAttribute,         //  attribute2="value">
+        tAttributeTag,      //  attribute on the same line as a tag
         tData,              // Tag data (formating done)
+        tImport,            // <import "type"="path" />
         tComment,           // <!-- Comment -->
         tCDATA              // <![CDATA[ ... ]]>
@@ -86 +90 @@
     int indentLevel();
     void setState(XMLState state);
+    void setFormat(XMLFormat newFormat);
     XMLState state();
 
@@ -122 +127 @@
     void addRaw(const QString &rawText);
     void addAttribute(const QString &attribute, const QString &value);
+    void addAttributeTag(const QString &attribute, const QString &value);
     void addData(const QString &data);
 
@@ -164 +170 @@
 }
 
+
+inline XmlOutput::xml_output valueTag(const QString &value)
+{
+    return XmlOutput::xml_output(XmlOutput::tValueTag, value, QString());
+}
+
+inline XmlOutput::xml_output tagValue(const QString &tagName, const QString &value)
+{
+    return XmlOutput::xml_output(XmlOutput::tTagValue, tagName, value);
+}
+
+inline XmlOutput::xml_output import(const QString &tagName, const QString &value)
+{
+    return XmlOutput::xml_output(XmlOutput::tImport, tagName, value);
+}
+
 inline XmlOutput::xml_output closetag()
 {
@@ -185 +207 @@
 }
 
+inline XmlOutput::xml_output attributeTag(const QString &name,
+                                       const QString &value)
+{
+    return XmlOutput::xml_output(XmlOutput::tAttributeTag, name, value);
+}
+
 inline XmlOutput::xml_output attr(const QString &name,
                                   const QString &value)
@@ -191 +219 @@
 }
 
+inline XmlOutput::xml_output attrTag(const QString &name,
+                                  const QString &value)
+{
+    return attributeTag(name, value);
+}
+
 inline XmlOutput::xml_output data(const QString &text = QString())
 {

trunk/qmake/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -154 +154 @@
             debug_msg(1, "Resetting dir to: %s", oldpwd.toLatin1().constData());
             qmake_setpwd(oldpwd); //reset the old pwd
-            int di = fn.lastIndexOf(Option::dir_sep);
+            int di = fn.lastIndexOf(QDir::separator());
             if(di != -1) {
                 debug_msg(1, "Changing dir to: %s", fn.left(di).toLatin1().constData());

trunk/qmake/meta.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/meta.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/option.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -85 +85 @@
 //all modes
 QString Option::qmake_abslocation;
-int Option::warn_level = WarnLogic;
+int Option::warn_level = WarnLogic | WarnDeprecated;
 int Option::debug_level = 0;
 QFile Option::output;
 QString Option::output_dir;
-bool Option::recursive = false;
+Option::QMAKE_RECURSIVE Option::recursive = Option::QMAKE_RECURSIVE_DEFAULT;
 QStringList Option::before_user_vars;
 QStringList Option::after_user_vars;
@@ -97 +97 @@
 QString Option::user_template_prefix;
 QStringList Option::shellPath;
-#if defined(Q_OS_WIN32)
-Option::TARG_MODE Option::target_mode = Option::TARG_WIN_MODE;
-#elif defined(Q_OS_OS2)
-Option::TARG_MODE Option::target_mode = Option::TARG_OS2_MODE;
-#elif defined(Q_OS_MAC)
-Option::TARG_MODE Option::target_mode = Option::TARG_MACX_MODE;
-#else
-Option::TARG_MODE Option::target_mode = Option::TARG_UNIX_MODE;
-#endif
+Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE;
+Option::TARG_MODE Option::target_mode = Option::TARG_UNKNOWN_MODE;
+bool Option::target_mode_overridden = false;
 
 //QMAKE_*_PROPERTY stuff
@@ -129 +123 @@
 static Option::QMAKE_MODE default_mode(QString progname)
 {
-    int s = progname.lastIndexOf(Option::dir_sep);
+    int s = progname.lastIndexOf(QDir::separator());
     if(s != -1)
         progname = progname.right(progname.length() - (s + 1));
@@ -137 +131 @@
         return Option::QMAKE_QUERY_PROPERTY;
     return Option::QMAKE_GENERATE_MAKEFILE;
+}
+
+static QString detectProjectFile(const QString &path)
+{
+    QString ret;
+    QDir dir(path);
+    if(dir.exists(dir.dirName() + Option::pro_ext)) {
+        ret = dir.filePath(dir.dirName()) + Option::pro_ext;
+    } else { //last try..
+        QStringList profiles = dir.entryList(QStringList("*" + Option::pro_ext));
+        if(profiles.count() == 1)
+            ret = dir.filePath(profiles.at(0));
+    }
+    return ret;
 }
 
@@ -163 +171 @@
             "\n"
             "Warnings Options:\n"
-            "  -Wnone         Turn off all warnings\n"
+            "  -Wnone         Turn off all warnings; specific ones may be re-enabled by\n"
+            "                 later -W options\n"
             "  -Wall          Turn on all warnings\n"
             "  -Wparser       Turn on parser warnings\n"
-            "  -Wlogic        Turn on logic warnings\n"
+            "  -Wlogic        Turn on logic warnings (on by default)\n"
+            "  -Wdeprecated   Turn on deprecation warnings (on by default)\n"
             "\n"
             "Options:\n"
@@ -173 +183 @@
             "   * before [files].                                                     *\n"
             "  -o file        Write output to file\n"
-            "  -unix          Run in unix mode\n"
-            "  -win32         Run in win32 mode\n"
-            "  -os2           Run in OS/2 mode\n"
-            "  -macx          Run in Mac OS X mode\n"
             "  -d             Increase debug level\n"
             "  -t templ       Overrides TEMPLATE as templ\n"
@@ -213 +219 @@
                 bool specified = true;
                 if(opt == "project") {
-                    Option::recursive = true;
+                    Option::recursive = Option::QMAKE_RECURSIVE_YES;
                     Option::qmake_mode = Option::QMAKE_GENERATE_PROJECT;
                 } else if(opt == "prl") {
@@ -240 +246 @@
             } else if(opt == "tp" || opt == "template_prefix") {
                 Option::user_template_prefix = argv[++x];
-            } else if(opt == "mac9") {
-                Option::target_mode = TARG_MAC9_MODE;
             } else if(opt == "macx") {
+                fprintf(stderr, "-macx is deprecated.\n");
+                Option::host_mode = HOST_MACX_MODE;
                 Option::target_mode = TARG_MACX_MODE;
+                Option::target_mode_overridden = true;
             } else if(opt == "unix") {
+                fprintf(stderr, "-unix is deprecated.\n");
+                Option::host_mode = HOST_UNIX_MODE;
                 Option::target_mode = TARG_UNIX_MODE;
+                Option::target_mode_overridden = true;
             } else if(opt == "win32") {
+                fprintf(stderr, "-win32 is deprecated.\n");
+                Option::host_mode = HOST_WIN_MODE;
                 Option::target_mode = TARG_WIN_MODE;
+                Option::target_mode_overridden = true;
             } else if(opt == "os2") {
+                fprintf(stderr, "-os2 is deprecated.\n");
+                Option::host_mode = TARG_OS2_MODE;
                 Option::target_mode = TARG_OS2_MODE;
+                Option::target_mode_overridden = true;
             } else if(opt == "d") {
                 Option::debug_level++;
@@ -270 +286 @@
             } else if(opt == "Wlogic") {
                 Option::warn_level |= WarnLogic;
+            } else if(opt == "Wdeprecated") {
+                Option::warn_level |= WarnDeprecated;
             } else if(opt == "Wnone") {
                 Option::warn_level = WarnNone;
             } else if(opt == "r" || opt == "recursive") {
-                Option::recursive = true;
-            } else if(opt == "norecursive") {
-                Option::recursive = false;
+                Option::recursive = Option::QMAKE_RECURSIVE_YES;
+            } else if(opt == "nr" || opt == "norecursive") {
+                Option::recursive = Option::QMAKE_RECURSIVE_NO;
             } else if(opt == "config") {
                 Option::user_configs += argv[++x];
@@ -292 +310 @@
                         Option::mkfile::do_dep_heuristics = false;
                     } else if(opt == "E") {
+                        fprintf(stderr, "-E is deprecated. Use -d instead.\n");
                         Option::mkfile::do_preprocess = true;
                     } else if(opt == "cache") {
@@ -328 +347 @@
                         arg = fi.filePath();
                     if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
-                       Option::qmake_mode == Option::QMAKE_GENERATE_PRL)
+                       Option::qmake_mode == Option::QMAKE_GENERATE_PRL) {
+                        if(fi.isDir()) {
+                            QString proj = detectProjectFile(arg);
+                            if (!proj.isNull())
+                                arg = proj;
+                        }
                         Option::mkfile::project_files.append(arg);
-                    else if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)
+                    } else if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) {
                         Option::projfile::project_dirs.append(arg);
-                    else
+                    } else {
                         handled = false;
+                    }
                 }
                 if(!handled) {
@@ -401 +426 @@
     Option::dirlist_sep = ";";
     Option::shellPath = detectShellPath();
+    Option::res_ext = ".res";
 #else
     Option::dirlist_sep = ":";
+    Option::shellPath = QStringList("sh");
 #endif
     Option::sysenv_mod = "QMAKE_ENV_";
@@ -508 +535 @@
         //try REALLY hard to do it for them, lazy..
         if(Option::mkfile::project_files.isEmpty()) {
-            QString pwd = qmake_getpwd(),
-                   proj = pwd + "/" + pwd.right(pwd.length() - (pwd.lastIndexOf('/') + 1)) + Option::pro_ext;
-            if(QFile::exists(proj)) {
+            QString proj = detectProjectFile(qmake_getpwd());
+            if(!proj.isNull())
                 Option::mkfile::project_files.append(proj);
-            } else { //last try..
-                QStringList profiles = QDir(pwd).entryList(QStringList("*" + Option::pro_ext));
-                if(profiles.count() == 1)
-                    Option::mkfile::project_files.append(pwd + "/" + profiles[0]);
-            }
 #ifndef QT_BUILD_QMAKE_LIBRARY
             if(Option::mkfile::project_files.isEmpty()) {
@@ -524 +545 @@
 #endif
         }
+    } else if (Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) {
+#if defined(Q_OS_MAC)
+        Option::host_mode = Option::HOST_MACX_MODE;
+        Option::target_mode = Option::TARG_MACX_MODE;
+#elif defined(Q_OS_UNIX)
+        Option::host_mode = Option::HOST_UNIX_MODE;
+        Option::target_mode = Option::TARG_UNIX_MODE;
+#elif defined(Q_OS_OS2)
+        Option::host_mode = Option::HOST_OS2_MODE;
+        Option::target_mode = Option::TARG_OS2_MODE;
+#else
+        Option::host_mode = Option::HOST_WIN_MODE;
+        Option::target_mode = Option::TARG_WIN_MODE;
+#endif
     }
 
     //defaults for globals
-    if(Option::target_mode == Option::TARG_WIN_MODE ||
-       Option::target_mode == Option::TARG_OS2_MODE) {
-        Option::dir_sep = "\\";
-        Option::obj_ext = ".obj";
-        Option::res_ext = ".res";
-    } else {
-        if(Option::target_mode == Option::TARG_MAC9_MODE)
-            Option::dir_sep = ":";
-        else
-            Option::dir_sep = "/";
-        Option::obj_ext = ".o";
-    }
-    Option::qmake_abslocation = Option::fixPathToTargetOS(Option::qmake_abslocation);
+    if (Option::host_mode != Option::HOST_UNKNOWN_MODE)
+        applyHostMode();
     return QMAKE_CMDLINE_SUCCESS;
+}
+
+void Option::applyHostMode()
+{
+   if (Option::host_mode == Option::HOST_WIN_MODE ||
+       Option::host_mode == Option::HOST_OS2_MODE) {
+       Option::dir_sep = "\\";
+       Option::obj_ext = ".obj";
+   } else {
+       Option::dir_sep = "/";
+       Option::obj_ext = ".o";
+   }
 }
 
@@ -599 +635 @@
 Option::fixString(QString string, uchar flags)
 {
-    const QString orig_string = string;
+    //const QString orig_string = string;
     static QHash<FixStringCacheKey, QString> *cache = 0;
     if(!cache) {

trunk/qmake/option.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -64 +64 @@
     WarnParser  = 0x01,
     WarnLogic   = 0x02,
+    WarnDeprecated = 0x04,
     WarnAll     = 0xFF
 };
@@ -107 +108 @@
     //both of these must be called..
     static int init(int argc=0, char **argv=0); //parse cmdline
+    static void applyHostMode();
     static bool postProcessProject(QMakeProject *);
 
@@ -149 +151 @@
     static int debug_level;
     static int warn_level;
-    static bool recursive;
+    enum QMAKE_RECURSIVE { QMAKE_RECURSIVE_DEFAULT, QMAKE_RECURSIVE_YES, QMAKE_RECURSIVE_NO };
+    static QMAKE_RECURSIVE recursive;
     static QStringList before_user_vars, after_user_vars, user_configs, after_user_configs;
-    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_OS2_MODE };
+    enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE,
+                     HOST_OS2_MODE };
+    static HOST_MODE host_mode;
+    enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE,
+                     TARG_SYMBIAN_MODE, TARG_OS2_MODE };
     static TARG_MODE target_mode;
+    static bool target_mode_overridden;
     static QString user_template, user_template_prefix;
     static QStringList shellPath;
@@ -206 +214 @@
         SettingsPath,
         DemosPath,
-        ExamplesPath
+        ExamplesPath,
+        ImportsPath
     };
     static QString location(LibraryLocation);

trunk/qmake/project.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -44 +44 @@
 #include "option.h"
 #include "cachekeys.h"
+#include "generators/metamakefile.h"
 
 #include <qdatetime.h>
@@ -66 +67 @@
 
 // Included from tools/shared
-#include <symbian/epocroot.h>
+#include <symbian/epocroot_p.h>
 
 #ifdef Q_OS_WIN32
@@ -78 +79 @@
 QT_BEGIN_NAMESPACE
 
-//expand fucntions
+//expand functions
 enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST,
                   E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION,
@@ -124 +125 @@
                 T_RETURN, T_BREAK, T_NEXT, T_DEFINED, T_CONTAINS, T_INFILE,
                 T_COUNT, T_ISEMPTY, T_INCLUDE, T_LOAD, T_DEBUG, T_ERROR,
-                T_MESSAGE, T_WARNING, T_IF };
+                T_MESSAGE, T_WARNING, T_IF, T_OPTION };
 QMap<QString, TestFunc> qmake_testFunctions()
 {
@@ -158 +159 @@
         qmake_test_functions->insert("message", T_MESSAGE);
         qmake_test_functions->insert("warning", T_WARNING);
+        qmake_test_functions->insert("option", T_OPTION);
     }
     return *qmake_test_functions;
@@ -187 +189 @@
 {
     QString ret(x);
-    if(ret.startsWith("TMAKE")) //tmake no more!
-        ret = "QMAKE" + ret.mid(5);
-    else if(ret == "INTERFACES")
+    if(ret == "INTERFACES")
         ret = "FORMS";
     else if(ret == "QMAKE_POST_BUILD")
@@ -223 +223 @@
     else if(ret == "QMAKE_FRAMEWORKDIR_FLAGS")
         ret = "QMAKE_FRAMEWORKPATH_FLAGS";
+    else
+        return ret;
+    warn_msg(WarnDeprecated, "%s:%d: Variable %s is deprecated; use %s instead.",
+             parser.file.toLatin1().constData(), parser.line_no,
+             x.toLatin1().constData(), ret.toLatin1().constData());
     return ret;
 }
@@ -281 +286 @@
 }
 
-static QStringList split_value_list(const QString &vals, bool do_semicolon=false)
+static QStringList split_value_list(const QString &vals)
 {
     QString build;
@@ -292 +297 @@
     const ushort DOUBLEQUOTE = '"';
     const ushort BACKSLASH = '\\';
-    const ushort SEMICOLON = ';';
 
     ushort unicode;
@@ -312 +316 @@
         }
 
-        if(!parens && quote.isEmpty() && ((do_semicolon && unicode == SEMICOLON) ||
-                                           vals_data[x] == Option::field_sep)) {
+        if(!parens && quote.isEmpty() && (vals_data[x] == Option::field_sep)) {
             ret << build;
             build.clear();
@@ -512 +515 @@
 }
 
-enum isForSymbian_enum {
-    isForSymbian_NOT_SET = -1,
-    isForSymbian_FALSE = 0,
-    isForSymbian_ABLD = 1,
-    isForSymbian_SBSV2 = 2,
-};
-
-static isForSymbian_enum isForSymbian_value = isForSymbian_NOT_SET;
-
-// Checking for symbian build is primarily determined from the qmake spec,
-// but if that is not specified, detect if symbian is the default spec
-// by checking the MAKEFILE_GENERATOR variable value.
-static void init_symbian(const QMap<QString, QStringList>& vars)
-{
-    if (isForSymbian_value != isForSymbian_NOT_SET)
-        return;
-
-    QString spec = QFileInfo(Option::mkfile::qmakespec).fileName();
-    if (spec.startsWith("symbian-abld", Qt::CaseInsensitive)) {
-        isForSymbian_value = isForSymbian_ABLD;
-    } else if (spec.startsWith("symbian-sbsv2", Qt::CaseInsensitive)) {
-        isForSymbian_value = isForSymbian_SBSV2;
-    } else {
-        QStringList generatorList = vars["MAKEFILE_GENERATOR"];
-
-        if (!generatorList.isEmpty()) {
-            QString generator = generatorList.first();
-            if (generator.startsWith("SYMBIAN_ABLD"))
-                isForSymbian_value = isForSymbian_ABLD;
-            else if (generator.startsWith("SYMBIAN_SBSV2"))
-                isForSymbian_value = isForSymbian_SBSV2;
-            else
-                isForSymbian_value = isForSymbian_FALSE;
-        } else {
-            isForSymbian_value = isForSymbian_FALSE;
-        }
-    }
-
-    // Force recursive on Symbian, as non-recursive is not really a viable option there
-    if (isForSymbian_value != isForSymbian_FALSE)
-        Option::recursive = true;
-}
-
-bool isForSymbian()
-{
-    // If isForSymbian_value has not been initialized explicitly yet,
-    // call initializer with dummy map to check qmake spec.
-    if (isForSymbian_value == isForSymbian_NOT_SET)
-        init_symbian(QMap<QString, QStringList>());
-
-    return (isForSymbian_value != isForSymbian_FALSE);
-}
-
-bool isForSymbianSbsv2()
-{
-    // If isForSymbian_value has not been initialized explicitly yet,
-    // call initializer with dummy map to check qmake spec.
-    if (isForSymbian_value == isForSymbian_NOT_SET)
-        init_symbian(QMap<QString, QStringList>());
-
-    return (isForSymbian_value == isForSymbian_SBSV2);
-}
-
 /*
    1) environment variable QMAKEFEATURES (as separated by colons)
@@ -600 +540 @@
             concat << base_concat + QDir::separator() + "unix";
             break;
+        default: // Can't happen, just make the compiler shut up
         case Option::TARG_UNIX_MODE:
-            {
-                if (isForSymbian())
-                    concat << base_concat + QDir::separator() + "symbian";
-                else
-                    concat << base_concat + QDir::separator() + "unix";
-                break;
-            }
+            concat << base_concat + QDir::separator() + "unix";
+            break;
         case Option::TARG_WIN_MODE:
-            {
-                if (isForSymbian())
-                    concat << base_concat + QDir::separator() + "symbian";
-                else
-                    concat << base_concat + QDir::separator() + "win32";
-                break;
-            }
+            concat << base_concat + QDir::separator() + "win32";
+            break;
+        case Option::TARG_SYMBIAN_MODE:
+            concat << base_concat + QDir::separator() + "symbian";
+            break;
         case Option::TARG_OS2_MODE:
             concat << base_concat + QDir::separator() + "os2";
-            break;
-        case Option::TARG_MAC9_MODE:
-            concat << base_concat + QDir::separator() + "mac";
-            concat << base_concat + QDir::separator() + "mac9";
             break;
         }
@@ -635 +565 @@
     if(!Option::mkfile::cachefile.isEmpty()) {
         QString path;
-        int last_slash = Option::mkfile::cachefile.lastIndexOf(Option::dir_sep);
+        int last_slash = Option::mkfile::cachefile.lastIndexOf(QDir::separator());
         if(last_slash != -1)
-            path = Option::fixPathToLocalOS(Option::mkfile::cachefile.left(last_slash));
+            path = Option::fixPathToLocalOS(Option::mkfile::cachefile.left(last_slash), false);
         for(QStringList::Iterator concat_it = concat.begin();
             concat_it != concat.end(); ++concat_it)
@@ -693 +623 @@
 }
 
-class QMakeProjectEnv
-{
-    QStringList envs;
-public:
-    QMakeProjectEnv() { }
-    QMakeProjectEnv(QMakeProject *p) { execute(p->variables()); }
-    QMakeProjectEnv(const QMap<QString, QStringList> &values) { execute(values); }
-
-    void execute(QMakeProject *p) { execute(p->variables()); }
-    void execute(const QMap<QString, QStringList> &values) {
-#ifdef Q_OS_UNIX
-        for(QMap<QString, QStringList>::ConstIterator it = values.begin(); it != values.end(); ++it) {
-            const QString var = it.key(), val = it.value().join(" ");
-            if(!var.startsWith(".")) {
-                const QString env_var = Option::sysenv_mod + var;
-                if(!putenv(strdup(QString(env_var + "=" + val).toAscii().data())))
-                    envs.append(env_var);
-            }
-        }
-#else
-        Q_UNUSED(values);
-#endif
-    }
-    ~QMakeProjectEnv() {
-#ifdef Q_OS_UNIX
-        for(QStringList::ConstIterator it = envs.begin();it != envs.end(); ++it) {
-            putenv(strdup(QString(*it + "=").toAscii().data()));
-        }
-#endif
-    }
-};
-
 QMakeProject::~QMakeProject()
 {
@@ -754 +652 @@
         own_prop = false;
     }
+    recursive = false;
     reset();
 }
@@ -778 +677 @@
     iterator = 0;
     function = 0;
+    backslashWarned = false;
 }
 
@@ -783 +683 @@
 QMakeProject::parse(const QString &t, QMap<QString, QStringList> &place, int numLines)
 {
-    QString s = t.simplified();
+    // To preserve the integrity of any UTF-8 characters in .pro file, temporarily replace the
+    // non-breaking space (0xA0) characters with another non-space character, so that
+    // QString::simplified() call will not replace it with space.
+    // Note: There won't be any two byte characters in .pro files, so 0x10A0 should be a safe
+    // replacement character.
+    static QChar nbsp(0xA0);
+    static QChar nbspFix(0x01A0);
+    QString s;
+    if (t.indexOf(nbsp) != -1) {
+        s = t;
+        s.replace(nbsp, nbspFix);
+        s = s.simplified();
+        s.replace(nbspFix, nbsp);
+    } else {
+        s = t.simplified();
+    }
+
     int hash_mark = s.indexOf("#");
     if(hash_mark != -1) //good bye comments
@@ -1153 +1069 @@
     QString vals = s.mid(d_off); // vals now contains the space separated list of values
     int rbraces = vals.count('}'), lbraces = vals.count('{');
-    if(scope_blocks.count() > 1 && rbraces - lbraces == 1) {
+    if(scope_blocks.count() > 1 && rbraces - lbraces == 1 && vals.endsWith('}')) {
         debug_msg(1, "Project Parser: %s:%d : Leaving block %d", parser.file.toLatin1().constData(),
                   parser.line_no, scope_blocks.count());
@@ -1169 +1085 @@
 
     doVariableReplace(var, place);
-    var = varMap(var); //backwards compatability
+    var = varMap(var); //backwards compatibility
     if(!var.isEmpty() && Option::mkfile::do_preprocess) {
         static QString last_file("*none*");
@@ -1180 +1096 @@
 
     if(vals.contains('=') && numLines > 1)
-        warn_msg(WarnParser, "Detected possible line continuation: {%s} %s:%d",
+        warn_msg(WarnParser, "Possible accidental line continuation: {%s} at %s:%d",
                  var.toLatin1().constData(), parser.file.toLatin1().constData(), parser.line_no);
 
@@ -1233 +1149 @@
         {
             //doVariableReplace(vals, place);
-            QStringList tmp = split_value_list(vals, (var == "DEPENDPATH" || var == "INCLUDEPATH"));
+            QStringList tmp = split_value_list(vals);
             for(int i = 0; i < tmp.size(); ++i)
                 vallist += doVariableReplaceExpand(tmp[i], place);
@@ -1323 +1239 @@
 
     const QString oldpwd = qmake_getpwd();
-    QString filename = Option::fixPathToLocalOS(file);
-    doVariableReplace(filename, place);
+    QString filename = Option::fixPathToLocalOS(file, false);
     bool ret = false, using_stdin = false;
     QFile qfile;
@@ -1368 +1283 @@
 {
     if(cfile.isEmpty()) {
-        //find out where qmake (myself) lives
-        if (!base_vars.contains("QMAKE_QMAKE")) {
-            if (!Option::qmake_abslocation.isNull())
-                base_vars["QMAKE_QMAKE"] = QStringList(Option::qmake_abslocation);
-            else
-                base_vars["QMAKE_QMAKE"] = QStringList("qmake");
-        }
-
         // hack to get the Option stuff in there
-        base_vars["QMAKE_EXT_OBJ"] = QStringList(Option::obj_ext);
         base_vars["QMAKE_EXT_CPP"] = Option::cpp_ext;
         base_vars["QMAKE_EXT_C"] = Option::c_ext;
@@ -1463 +1369 @@
                 qmakespec.truncate(qmakespec.length()-1);
             QString spec = qmakespec + QDir::separator() + "qmake.conf";
-            if(!QFile::exists(spec) &&
-               QFile::exists(qmakespec + QDir::separator() + "tmake.conf"))
-                spec = qmakespec + QDir::separator() + "tmake.conf";
             debug_msg(1, "QMAKESPEC conf: reading %s", spec.toLatin1().constData());
             if(!read(spec, base_vars)) {
@@ -1471 +1374 @@
                 return false;
             }
-
-            init_symbian(base_vars);
+            validateModes();
 
             if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty()) {
@@ -1524 +1426 @@
         if(!read(pfile, vars))
             return false;
-    }
-
-    if(cmd & ReadPostFiles) { // parse post files
-        const QStringList l = vars["QMAKE_POST_INCLUDE_FILES"];
-        for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-            if(read((*it), vars)) {
-                if(vars["QMAKE_INTERNAL_INCLUDED_FILES"].indexOf((*it)) == -1)
-                    vars["QMAKE_INTERNAL_INCLUDED_FILES"].append((*it));
-            }
-        }
     }
 
@@ -1596 +1488 @@
 }
 
+void QMakeProject::validateModes()
+{
+    if (Option::host_mode == Option::HOST_UNKNOWN_MODE
+        || Option::target_mode == Option::TARG_UNKNOWN_MODE) {
+        Option::HOST_MODE host_mode;
+        Option::TARG_MODE target_mode;
+        const QStringList &gen = base_vars.value("MAKEFILE_GENERATOR");
+        if (gen.isEmpty()) {
+            fprintf(stderr, "%s:%d: Using OS scope before setting MAKEFILE_GENERATOR\n",
+                            parser.file.toLatin1().constData(), parser.line_no);
+        } else if (MetaMakefileGenerator::modesForGenerator(gen.first(),
+                                                            &host_mode, &target_mode)) {
+            if (Option::host_mode == Option::HOST_UNKNOWN_MODE) {
+                Option::host_mode = host_mode;
+                Option::applyHostMode();
+            }
+
+            if (Option::target_mode == Option::TARG_UNKNOWN_MODE) {
+                const QStringList &tgt = base_vars.value("TARGET_PLATFORM");
+                if (!tgt.isEmpty()) {
+                    const QString &os = tgt.first();
+                    if (os == "unix")
+                        Option::target_mode = Option::TARG_UNIX_MODE;
+                    else if (os == "macx")
+                        Option::target_mode = Option::TARG_MACX_MODE;
+                    else if (os == "symbian")
+                        Option::target_mode = Option::TARG_SYMBIAN_MODE;
+                    else if (os == "win32")
+                        Option::target_mode = Option::TARG_WIN_MODE;
+                    else
+                        fprintf(stderr, "Unknown target platform specified: %s\n",
+                                os.toLatin1().constData());
+                } else {
+                    Option::target_mode = target_mode;
+                }
+            }
+        }
+    }
+}
+
 bool
 QMakeProject::isActiveConfig(const QString &x, bool regex, QMap<QString, QStringList> *place)
@@ -1608 +1540 @@
         return false;
 
+    if (x == "unix") {
+        validateModes();
+        return Option::target_mode == Option::TARG_UNIX_MODE
+               || Option::target_mode == Option::TARG_MACX_MODE
+               || Option::target_mode == Option::TARG_SYMBIAN_MODE;
+    } else if (x == "macx" || x == "mac") {
+        validateModes();
+        return Option::target_mode == Option::TARG_MACX_MODE;
+    } else if (x == "symbian") {
+        validateModes();
+        return Option::target_mode == Option::TARG_SYMBIAN_MODE;
+    } else if (x == "win32") {
+        validateModes();
+        return Option::target_mode == Option::TARG_WIN_MODE;
+    }
+
+    //mkspecs
     static QString spec;
     if(spec.isEmpty())
         spec = QFileInfo(Option::mkfile::qmakespec).fileName();
-
-    // Symbian is an exception to how scopes are resolved. Since we do not
-    // have a separate target mode for Symbian, but we expect the scope to resolve
-    // on other platforms we base it entirely on the mkspec. This means that
-    // using a mkspec starting with 'symbian*' will resolve both the 'symbian'
-    // and the 'unix' (because of Open C) scopes to true.
-    if(isForSymbian() && (x == "symbian" || x == "unix"))
-        return true;
-
-    //mkspecs
-    if((Option::target_mode == Option::TARG_MACX_MODE ||
-        Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
-        return !isForSymbian();
-    else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx")
-        return !isForSymbian();
-    else if(Option::target_mode == Option::TARG_MAC9_MODE && x == "mac9")
-        return !isForSymbian();
-    else if((Option::target_mode == Option::TARG_MAC9_MODE || Option::target_mode == Option::TARG_MACX_MODE) &&
-            x == "mac")
-        return !isForSymbian();
-    else if(Option::target_mode == Option::TARG_WIN_MODE && x == "win32")
-        return !isForSymbian();
     else if(Option::target_mode == Option::TARG_OS2_MODE && x == "os2")
         return true;
@@ -1723 +1650 @@
             static QStringList *feature_roots = 0;
             if(!feature_roots) {
-                init_symbian(base_vars);
+                validateModes();
                 feature_roots = new QStringList(qmake_feature_paths(prop));
                 qmakeAddCacheClear(qmakeDeleteCacheClear_QStringList, (void**)&feature_roots);
@@ -1804 +1731 @@
             return IncludeFailure;
         }
-        file = file.right(file.length() - di - 1);
     }
     bool parsed = false;
@@ -1824 +1750 @@
                     proj.doProjectInclude("default", IncludeFlagFeature, proj.variables());
 #endif
-                parsed = proj.read(file, proj.variables());
+                parsed = proj.read(file, proj.variables()); // parse just that file (fromfile, infile)
             } else {
-                parsed = proj.read(file);
+                parsed = proj.read(file); // parse all aux files (load/include into)
             }
             place = proj.variables();
@@ -1894 +1820 @@
         args += args_list[i].join(QString(Option::field_sep));
 
-    ExpandFunc func_t = qmake_expandFunctions().value(func.toLower());
+    ExpandFunc func_t = qmake_expandFunctions().value(func);
+    if (!func_t && (func_t = qmake_expandFunctions().value(func.toLower())))
+        warn_msg(WarnDeprecated, "%s:%d: Using uppercased builtin functions is deprecated.",
+                 parser.file.toLatin1().constData(), parser.line_no);
     debug_msg(1, "Running project expand: %s(%s) [%d]",
               func.toLatin1().constData(), args.join("::").toLatin1().constData(), func_t);
@@ -2148 +2077 @@
                     parser.file.toLatin1().constData(), parser.line_no);
         } else {
-            QMakeProjectEnv env(place);
             char buff[256];
             bool singleLine = true;
@@ -2252 +2180 @@
             for(int d = 0; d < dirs.count(); d++) {
                 QString dir = dirs[d];
-                if(!dir.isEmpty() && !dir.endsWith(Option::dir_sep))
+                if(!dir.isEmpty() && !dir.endsWith(QDir::separator()))
                     dir += "/";
 
@@ -2274 +2202 @@
             fprintf(stderr, "%s:%d prompt(question) requires one argument.\n",
                     parser.file.toLatin1().constData(), parser.line_no);
-        } else if(projectFile() == "-") {
+        } else if(pfile == "-") {
             fprintf(stderr, "%s:%d prompt(question) cannot be used when '-o -' is used.\n",
                     parser.file.toLatin1().constData(), parser.line_no);
@@ -2308 +2236 @@
                     parser.file.toLatin1().constData(), parser.line_no);
         } else {
-            //QString target = args[0];
-            int size = values(args[0]).size();
+            int size = values(args[0], place).size();
             ret += QString::number(size);
         }
@@ -2437 +2364 @@
                     test += *(d+d_off);
                 if(!test.isEmpty()) {
-                    const bool success = doProjectTest(test, place);
-                    test = "";
-                    if(or_op)
-                        ret = ret || success;
-                    else
-                        ret = ret && success;
+                    if (or_op != ret)
+                        ret = doProjectTest(test, place);
+                    test.clear();
                 }
                 if(*(d+d_off) == QLatin1Char(':')) {
@@ -2474 +2398 @@
         //regular expression I guess
         QString dirstr = qmake_getpwd();
-        int slsh = file.lastIndexOf(Option::dir_sep);
+        int slsh = file.lastIndexOf(QDir::separator());
         if(slsh != -1) {
             dirstr = file.left(slsh+1);
@@ -2545 +2469 @@
         }
         return false; }
-    case T_SYSTEM: {
-        bool setup_env = true;
+    case T_SYSTEM:
         if(args.count() < 1 || args.count() > 2) {
             fprintf(stderr, "%s:%d: system(exec) requires one argument.\n", parser.file.toLatin1().constData(),
@@ -2554 +2477 @@
         if(args.count() == 2) {
             const QString sarg = args[1];
-            setup_env = (sarg.toLower() == "true" || sarg.toInt());
-        }
-        QMakeProjectEnv env;
-        if(setup_env)
-            env.execute(place);
-        bool ret = system(args[0].toLatin1().constData()) == 0;
-        return ret; }
+            if (sarg.toLower() == "true" || sarg.toInt())
+                warn_msg(WarnParser, "%s:%d: system()'s second argument is now hard-wired to false.\n",
+                         parser.file.toLatin1().constData(), parser.line_no);
+        }
+        return system(args[0].toLatin1().constData()) == 0;
     case T_RETURN:
         if(function_blocks.isEmpty()) {
@@ -2575 +2496 @@
         if(iterator)
             iterator->cause_break = true;
-        else if(!scope_blocks.isEmpty())
-            scope_blocks.top().ignore = true;
         else
             fprintf(stderr, "%s:%d unexpected break()\n",
@@ -2791 +2710 @@
 #endif
         return true; }
+    case T_OPTION:
+        if (args.count() != 1) {
+            fprintf(stderr, "%s:%d: option() requires one argument.\n",
+                    parser.file.toLatin1().constData(), parser.line_no);
+            return false;
+        }
+        if (args.first() == "recursive") {
+            recursive = true;
+        } else {
+            fprintf(stderr, "%s:%d: unrecognized option() argument '%s'.\n",
+                    parser.file.toLatin1().constData(), parser.line_no,
+                    args.first().toLatin1().constData());
+            return false;
+        }
+        return true;
     default:
         fprintf(stderr, "%s:%d: Unknown test function: %s\n", parser.file.toLatin1().constData(), parser.line_no,
@@ -3012 +2946 @@
                     break;
                 }
+            }
+            if(!escape && !backslashWarned) {
+                backslashWarned = true;
+                warn_msg(WarnDeprecated, "%s:%d: Unescaped backslashes are deprecated.",
+                         parser.file.toLatin1().constData(), parser.line_no);
             }
             if(escape || !replaced)
@@ -3090 +3029 @@
             if(!Option::user_template_prefix.isEmpty() && !orig_template.startsWith(Option::user_template_prefix))
                 real_template = Option::user_template_prefix + orig_template;
-            if(real_template.endsWith(".t"))
-                real_template = real_template.left(real_template.length()-2);
             if(!real_template.isEmpty()) {
                 var = ".BUILTIN." + var;
@@ -3206 +3143 @@
         if (place[var].isEmpty())
             return values("DIR_SEPARATOR", place);
+    } else if (var == QLatin1String("QMAKE_EXT_OBJ")) {
+        if (place[var].isEmpty()) {
+            var = ".BUILTIN." + var;
+            place[var] = QStringList(Option::obj_ext);
+        }
+    } else if (var == QLatin1String("QMAKE_QMAKE")) {
+        if (place[var].isEmpty())
+            place[var] = QStringList(Option::fixPathToTargetOS(
+                !Option::qmake_abslocation.isEmpty()
+                    ? Option::qmake_abslocation
+                    : QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmake",
+                false));
     } else if (var == QLatin1String("EPOCROOT")) {
         if (place[var].isEmpty())
-            place[var] = QStringList(epocRoot());
-    }
+            place[var] = QStringList(qt_epocRoot());
+    }
+#if defined(Q_OS_WIN32) && defined(Q_CC_MSVC)
+      else if(var.startsWith(QLatin1String("QMAKE_TARGET."))) {
+            QString ret, type = var.mid(13);
+            if(type == "arch") {
+                QString paths = qgetenv("PATH");
+                QString vcBin64 = qgetenv("VCINSTALLDIR").append("\\bin\\amd64");
+                QString vcBinX86_64 = qgetenv("VCINSTALLDIR").append("\\bin\\x86_amd64");
+                if(paths.contains(vcBin64,Qt::CaseInsensitive) || paths.contains(vcBinX86_64,Qt::CaseInsensitive))
+                    ret = "x86_64";
+                else
+                    ret = "x86";
+            }
+            place[var] = QStringList(ret);
+    }
+#endif
     //qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::")));
     return place[var];
 }
 
+bool QMakeProject::isEmpty(const QString &v)
+{
+    QMap<QString, QStringList>::ConstIterator it = vars.constFind(varMap(v));
+    return it == vars.constEnd() || it->isEmpty();
+}
+
 QT_END_NAMESPACE

trunk/qmake/project.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -79 +79 @@
     QMap<QString, FunctionBlock*> testFunctions, replaceFunctions;
 
+    bool recursive;
     bool own_prop;
+    bool backslashWarned;
     QString pfile, cfile;
     QMakeProperty *prop;
@@ -106 +108 @@
     void init(QMakeProperty *, const QMap<QString, QStringList> *);
     QStringList &values(const QString &v, QMap<QString, QStringList> &place);
+    void validateModes();
 
 public:
@@ -116 +119 @@
 
     enum { ReadCache=0x01, ReadConf=0x02, ReadCmdLine=0x04, ReadProFile=0x08,
-           ReadPostFiles=0x10, ReadFeatures=0x20, ReadConfigs=0x40, ReadAll=0xFF };
+           ReadFeatures=0x20, ReadConfigs=0x40, ReadAll=0xFF };
     inline bool parse(const QString &text) { return parse(text, vars); }
     bool read(const QString &project, uchar cmd=ReadAll);
@@ -125 +128 @@
 
     QString projectFile();
-    QString configFile();
     inline QMakeProperty *properties() { return prop; }
 
@@ -149 +151 @@
                         QMap<QString, QStringList> *place=NULL);
 
-    bool isSet(const QString &v);
-    bool isEmpty(const QString &v);
-    QStringList &values(const QString &v);
-    QString first(const QString &v);
-    QMap<QString, QStringList> &variables();
+    bool isSet(const QString &v); // No compat mapping, no magic variables
+    bool isEmpty(const QString &v); // With compat mapping, but no magic variables
+    QStringList &values(const QString &v); // With compat mapping and magic variables
+    QString first(const QString &v); // ditto
+    QMap<QString, QStringList> &variables(); // No compat mapping and magic, obviously
+
+    bool isRecursive() const { return recursive; }
 
 protected:
@@ -170 +174 @@
 }
 
-inline QString QMakeProject::configFile()
-{ return cfile; }
-
 inline QStringList &QMakeProject::values(const QString &v)
 { return values(v, vars); }
-
-inline bool QMakeProject::isEmpty(const QString &v)
-{ return !isSet(v) || values(v).isEmpty(); }
 
 inline bool QMakeProject::isSet(const QString &v)
@@ -193 +191 @@
 { return vars; }
 
-// Helper functions needed for Symbian
-bool isForSymbian();
-bool isForSymbianSbsv2();
-
 QT_END_NAMESPACE
 

trunk/qmake/property.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -96 +96 @@
     else if(v == "QT_INSTALL_PLUGINS")
         return QLibraryInfo::location(QLibraryInfo::PluginsPath);
+    else if(v == "QT_INSTALL_IMPORTS")
+        return QLibraryInfo::location(QLibraryInfo::ImportsPath);
     else if(v == "QT_INSTALL_TRANSLATIONS")
         return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
@@ -105 +107 @@
         return QLibraryInfo::location(QLibraryInfo::DemosPath);
     else if(v == "QMAKE_MKSPECS")
-        return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE || 
-                                         Option::target_mode == Option::TARG_OS2_MODE ? ";" : ":");
+        return qmake_mkspec_paths().join(Option::dirlist_sep);
     else if(v == "QMAKE_VERSION")
         return qmake_version();
@@ -193 +194 @@
             specialProps.append("QT_INSTALL_BINS");
             specialProps.append("QT_INSTALL_PLUGINS");
+            specialProps.append("QT_INSTALL_IMPORTS");
             specialProps.append("QT_INSTALL_TRANSLATIONS");
             specialProps.append("QT_INSTALL_CONFIGURATION");

trunk/qmake/property.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/qmake/qmake.pri

@@ -8 +8 @@
            generators/xmloutput.cpp generators/win32/borland_bmake.cpp \
            generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
-           generators/win32/msvc_dsp.cpp generators/win32/msvc_vcproj.cpp \
-           generators/win32/msvc_objectmodel.cpp \
+           generators/win32/msvc_vcproj.cpp \
+           generators/win32/msvc_vcxproj.cpp \
+           generators/win32/msvc_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp \
+           generators/symbian/symbiancommon.cpp \
            generators/symbian/symmake.cpp \
            generators/symbian/symmake_abld.cpp \
            generators/symbian/symmake_sbsv2.cpp \
            generators/symbian/initprojectdeploy_symbian.cpp \
+           generators/os2/gnumake.cpp \
            windows/registry.cpp \
-           symbian/epocroot.cpp \
-           generators/os2/gnumake.cpp
+           symbian/epocroot.cpp
 
 HEADERS += project.h property.h generators/makefile.h \
            generators/unix/unixmake.h meta.h option.h cachekeys.h \
-           generators/win32/winmakefile.h generators/projectgenerator.h \
+           generators/win32/winmakefile.h generators/win32/mingw_make.h generators/projectgenerator.h \
            generators/makefiledeps.h generators/metamakefile.h generators/mac/pbuilder_pbx.h \
            generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \
-           generators/win32/msvc_dsp.h generators/win32/msvc_vcproj.h \
-           generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \
+           generators/win32/msvc_vcproj.h \
+           generators/win32/msvc_vcxproj.h \
+           generators/win32/msvc_objectmodel.h generators/win32/msbuild_objectmodel.h \
+           generators/symbian/symbiancommon.h \
            generators/symbian/symmake.h \
            generators/symbian/symmake_abld.h \
            generators/symbian/symmake_sbsv2.h \
            generators/symbian/initprojectdeploy_symbian.h \
-           windows/registry.h \
-           symbian/epocroot.h \
            generators/os2/gnumake.h
+           windows/registry_p.h \
+           symbian/epocroot_p.h
 
 contains(QT_EDITION, OpenSource) {
@@ -41 +45 @@
    SKIP_DEPENDS += qconfig.h qmodules.h
    DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_STL QT_NO_COMPRESS QT_NO_UNICODETABLES \
-              QT_NO_GEOM_VARIANT QT_NO_DATASTREAM
+              QT_NO_GEOM_VARIANT QT_NO_DATASTREAM QLIBRARYINFO_EPOCROOT
    DEFINES+=QT_NODLL QT_NO_THREAD
    SOURCES+= \
@@ -130 +134 @@
         }
     } else:win32 {
-        SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp
+        SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp \
+            qsystemlibrary.cpp
         win32-msvc*:LIBS += ole32.lib advapi32.lib
-        win32-g++:LIBS += -lole32 -luuid
+        win32-g++*:LIBS += -lole32 -luuid
     } else:os2 {
         SOURCES += qfsfileengine_os2.cpp qfsfileengine_iterator_os2.cpp qsettings_os2.cpp

trunk/qmake/qmake.pro

@@ -22 +22 @@
          $$QT_SOURCE_TREE/src/corelib/xml \
          $$QT_SOURCE_TREE/src/corelib/io
-INCPATH += generators \
+INCLUDEPATH += . \
+           generators \
            generators/unix \
            generators/win32 \
@@ -33 +34 @@
 
 VPATH += $$QT_SOURCE_TREE/tools/shared
-INCPATH += $$QT_SOURCE_TREE/tools/shared
+INCLUDEPATH += $$QT_SOURCE_TREE/tools/shared
 
 include(qmake.pri)

trunk/qmake/qmake_pch.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)