--- a/mkspecs/common/symbian/symbian.conf	Wed Apr 21 12:15:23 2010 +0300
+++ b/mkspecs/common/symbian/symbian.conf	Wed Apr 21 20:15:53 2010 +0300
@@ -26,7 +26,7 @@
 QMAKE_CFLAGS_DEBUG	=
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
-
+MMP_OPTION_KEYWORDS = CW ARMCC GCCE
 VERSION_FLAGS.ARMCC = ARMCC_4_0
 QMAKE_CXX		= g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
@@ -67,7 +67,7 @@
 QMAKE_LINK_OBJECT_MAX   =
 QMAKE_LINK_OBJECT_SCRIPT=
 
-QMAKE_LIBS		= -llibc -llibm -leuser -llibdl
+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
 QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository
 QMAKE_LIBS_NETWORK      = 
@@ -100,9 +100,10 @@
     QMAKE_CHK_DIR_EXISTS = test -d
 }
 
-QMAKE_MOC		= /epoc32/tools/qt/moc$$(DOTEXE)
-QMAKE_UIC		= /epoc32/tools/qt/uic$$(DOTEXE)
-QMAKE_IDC		= /epoc32/tools/qt/idc$$(DOTEXE)
+QMAKE_MOC		= /epoc32/tools/moc$$(DOTEXE)
+QMAKE_UIC		= /epoc32/tools/uic$$(DOTEXE)
+QMAKE_IDC		= /epoc32/tools/idc$$(DOTEXE)
+QMAKE_RCC		= /epoc32/tools/rcc$$(DOTEXE)
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= /epoc32/gcc_mingw/bin/ar -ru
@@ -181,12 +182,3 @@
         }
     }
 }
-
-# QMAKE_CXXFLAGS.ARMCC doesn't provide support for conditional options, so use MMP_RULES # to enable support for newer armcc compilers.
-# MMP files support combining multiple OPTION statements, so this is not a problem.
-newArmccRule = \
-    "$${LITERAL_HASH}if defined(ARMCC) && !defined(ARMCC_2_2) && !defined(ARMCC_3_1)"\
-    "OPTION ARMCC --import_all_vtbl" \
-    "$${LITERAL_HASH}endif"
-MMP_RULES += newArmccRule
-