--- a/messagingapp/msgutils/unieditorutils/editorgenutils/editorgenutils.pro	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgutils/unieditorutils/editorgenutils/editorgenutils.pro	Fri Jun 25 15:47:40 2010 +0530
@@ -21,7 +21,6 @@
 
 INCLUDEPATH += .
 INCLUDEPATH += ../../../../inc
-INCLUDEPATH += ../../s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 DEFINES += BUILD_MUIU_UITLS_DLL
@@ -50,11 +49,22 @@
 SOURCES += src/MuiuOperationWait.cpp \
     src/UniEditorGenUtils.cpp
 
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/editorgenutils.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/editorgenutils.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock
+
 LIBS += -leuser \
     -lCentralRepository \
     -lconvergedmessageutils \
     -lsssettings \
-    -ls60qconversions \
     -lMsgMedia \
-    -lapmime
+    -lapmime \
+    -lxqutils \
+    -lavkon \
+    -lefsrv