diff -r 84d9eb65b26f -r 518b245aa84c messagingapp/msgui/unifiedviewer/unifiedviewer.pro
--- a/messagingapp/msgui/unifiedviewer/unifiedviewer.pro	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgui/unifiedviewer/unifiedviewer.pro	Fri Jun 25 15:47:40 2010 +0530
@@ -25,7 +25,6 @@
 INCLUDEPATH += ../appengine/inc
 INCLUDEPATH += ../msguiutils/inc
 INCLUDEPATH += . ../../msgutils/unieditorutils/editorgenutils/inc
-INCLUDEPATH += . ../../msgutils/s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 #QMAKE_CXXFLAGS.ARMCC -= --no_hide_all
@@ -39,7 +38,7 @@
 TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 
 CONFIG += hb
-QT += sql
+HB += hbfeedback
 
 # Platforms
 SYMBIAN_PLATFORMS = WINSCW ARMV5
@@ -49,48 +48,55 @@
      "$${LITERAL_HASH}include <platform_paths.hrh>" \
      "rom/unifiedviewer.iby             CORE_APP_LAYER_IBY_EXPORT_PATH(unifiedviewer.iby)"
 
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/unifiedviewer.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/unifiedviewer.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock
+
 # Input
 HEADERS += inc/unifiedviewer.h \
            inc/unicontentswidget.h \
-           inc/unitexteditor.h \
-#           inc/unihighlighter.h \
            inc/univiewerfeeder.h \
            inc/univiewerfeeder_p.h \
            inc/univiewslidewidget.h \
            inc/uniscrollarea.h \
            ../inc/msgbaseview.h \
+           inc/univiewerutils.h \
            inc/univiewerbodywidget.h \
            inc/univiewerdetailswidget.h \
            inc/univieweraddresswidget.h \
            inc/univieweraddresscontainer.h \
-           inc/univiewermediawidget.h \
-           inc/univiewerattachmentcontainer.h \
+           inc/univiewerattachmentwidget.h \
            inc/univiewertextitem.h \
-           inc/univiewerheadercontainer.h
+           inc/univiewerheadercontainer.h \
+           inc/univiewerpixmapwidget.h \
+           inc/univieweraudiowidget.h
 
 SOURCES += src/unifiedviewer.cpp \
            src/unicontentswidget.cpp \
-           src/unitexteditor.cpp \
-#           src/unihighlighter.cpp \
            src/univiewerfeeder.cpp \
            src/univiewerfeeder_p.cpp \
            src/univiewslidewidget.cpp \
            src/uniscrollarea.cpp \
+           src/univiewerutils.cpp \
            src/univiewerbodywidget.cpp \
            src/univiewerdetailswidget.cpp \
            src/univieweraddresswidget.cpp \
            src/univieweraddresscontainer.cpp \
-           src/univiewermediawidget.cpp \
-           src/univiewerattachmentcontainer.cpp \
+           src/univiewerattachmentwidget.cpp \
            src/univiewertextitem.cpp \
-           src/univiewerheadercontainer.cpp
-
+           src/univiewerheadercontainer.cpp \
+           src/univiewerpixmapwidget.cpp \
+           src/univieweraudiowidget.cpp
 
 RESOURCES += unifiedviewer.qrc
 
 # Libs
-LIBS = -ls60qconversions \
-       -letext \
+LIBS = -letext \
        -lmsgs \
        -lconvergedmessageutils \
        -lappengine \
@@ -99,4 +105,5 @@
        -lQtContacts \
        -lmsguiutils \
        -lcentralrepository \
+       -lthumbnailmanagerqt \
        -lxqserviceutil