--- a/messagingapp/msgsettings/settingsview/settingsview.pro	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgsettings/settingsview/settingsview.pro	Thu Jul 22 16:32:06 2010 +0100
@@ -10,7 +10,6 @@
 INCLUDEPATH += .
 INCLUDEPATH += ../../../inc
 INCLUDEPATH += ../../msgui/inc
-INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 CONFIG += hb
@@ -51,10 +50,19 @@
      
 TARGET.CAPABILITY = All -TCB
 
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/settingsview.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/settingsview.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock
+
 LIBS += -lSmcm \
     -lmsgs \	
-    -ls60qconversions \
     -lcommdb \
     -lmmsserversettings \
-    -lmmsgenericsettings
+    -lmmsgenericsettings \
+    -lxqutils
     
\ No newline at end of file