--- a/mkspecs/common/symbian/symbian.conf	Tue Feb 02 00:43:10 2010 +0200
+++ b/mkspecs/common/symbian/symbian.conf	Fri Apr 16 15:50:13 2010 +0300
@@ -30,6 +30,7 @@
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS.CW	= 
 QMAKE_CXXFLAGS.ARMCC	= --visibility_inlines_hidden
+QMAKE_CXXFLAGS.GCCE	= -fvisibility-inlines-hidden
 QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
@@ -64,17 +65,29 @@
 QMAKE_LINK_OBJECT_SCRIPT=
 
 QMAKE_LIBS              = -llibc -llibm -leuser -llibdl -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lavkon -lefsrv -lcharconv -lws32 -lhal -lgdi -lapgrfx
-QMAKE_LIBS_CORE         = $$QMAKE_LIBS -llibpthread -lefsrv -lcharconv
-QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc
+QMAKE_LIBS_CORE         = $$QMAKE_LIBS -llibpthread -lefsrv
+QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository
 QMAKE_LIBS_NETWORK      = 
 QMAKE_LIBS_EGL          = -llibEGL
 QMAKE_LIBS_OPENGL       = 
-QMAKE_LIBS_OPENVG       = -llibOpenVG -lgraphicsresource
+QMAKE_LIBS_OPENVG       = -llibOpenVG -lfbscli -lbitgdi -lgdi
 QMAKE_LIBS_COMPAT       = 
 QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
 QMAKE_LIBS_S60          = -lavkon
 
-!isEmpty(QMAKE_SH) {
+exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) {
+    QMAKE_LIBS_OPENVG += -lsgresource
+}
+
+contains(QMAKE_HOST.os,Windows) {
+    QMAKE_COPY           = copy /y
+    QMAKE_COPY_DIR       = xcopy /s /q /y /i
+    QMAKE_MOVE           = move
+    QMAKE_DEL_FILE       = del
+    QMAKE_MKDIR          = mkdir
+    QMAKE_DEL_DIR        = rmdir
+    QMAKE_CHK_DIR_EXISTS = if not exist
+} else {
     QMAKE_COPY           = cp
     QMAKE_COPY_DIR       = cp -r
     QMAKE_MOVE           = mv
@@ -82,23 +95,15 @@
     QMAKE_MKDIR          = mkdir
     QMAKE_DEL_DIR        = rmdir
     QMAKE_CHK_DIR_EXISTS = test -d
-} else {
-    QMAKE_COPY           = copy /y
-    QMAKE_COPY_DIR       = xcopy /s /q /y /i
-    QMAKE_MOVE           = move
-    QMAKE_DEL_FILE       = del
-    QMAKE_MKDIR          = mkdir
-    QMAKE_DEL_DIR        = rmdir
-    QMAKE_CHK_DIR_EXISTS = if not exist
 }
 
-QMAKE_MOC		= $${EPOCROOT}epoc32/tools/qt/moc.exe
-QMAKE_UIC		= $${EPOCROOT}epoc32/tools/qt/uic.exe
-QMAKE_IDC		= $${EPOCROOT}epoc32/tools/qt/idc.exe
+QMAKE_MOC		= /epoc32/tools/qt/moc$$(DOTEXE)
+QMAKE_UIC		= /epoc32/tools/qt/uic$$(DOTEXE)
+QMAKE_IDC		= /epoc32/tools/qt/idc$$(DOTEXE)
 
 QMAKE_IDL		= midl
-QMAKE_LIB		= $${EPOCROOT}epoc32/gcc_mingw/bin/ar -ru
-QMAKE_RC		= $${EPOCROOT}epoc32/gcc_mingw/bin/windres
+QMAKE_LIB		= /epoc32/gcc_mingw/bin/ar -ru
+QMAKE_RC		= /epoc32/gcc_mingw/bin/windres
 QMAKE_ZIP		= zip -r -9
 
 QMAKE_STRIP		= $${EPOCROOT}epoc32/gcc_mingw/bin/strip
@@ -114,7 +119,7 @@
 } else {
     MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl"
 }
-MMP_RULES += PAGED
+MMP_RULES += PAGED BYTEPAIRCOMPRESSTARGET
 MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
 SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
 
@@ -144,6 +149,22 @@
         S60_VERSION = 3.2
     } else {
         S60_VERSION = 3.1
-        MMP_RULES -= PAGED
+        MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET
     }
 }
+
+QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast
+# [TODO] QMAKE_CXXFLAGS_FAST_VFP.GCCE =
+
+symbian {
+    armfpu = $$find(MMP_RULES, "ARMFPU")
+    !isEmpty(armfpu) {
+        vfpv2 = $$find(MMP_RULES, "vfpv2")
+        !isEmpty(vfpv2) {
+            # we will respect fpu setting obtained from configure, but,
+            # if vfpv2 or softvfp+vfpv2 used we want to force RunFast VFP mode
+            QMAKE_CXXFLAGS.ARMCC += $${QMAKE_CXXFLAGS_FAST_VFP.ARMCC}
+            # [TODO] QMAKE_CXXFLAGS.GCCE += $${QMAKE_CXXFLAGS_FAST_VFP.GCCE}
+        }
+    }
+}