--- a/ui/views/views.pro	Wed Jun 16 13:08:54 2010 +0100
+++ b/ui/views/views.pro	Thu Jul 22 16:33:32 2010 +0100
@@ -20,10 +20,9 @@
 DEPENDPATH += . fullscreenview/inc fullscreenview/src gridview/inc gridview/src slideshowsettingsview/inc slideshowsettingsview/src viewbase/inc
 CONFIG += hb
 
-LIBS += -lglxmediamodel.dll \
-        -lglxlistmodel.dll \
-        -lglxfavmediamodel.dll \
-	-lglximagedecoderwrapper.dll \
+LIBS += -lglxfavmediamodel.dll \
+        -lglxmediamodel.dll \
+        -lglximagedecoderwrapper.dll \
         -lglxloggerqt.dll \
         -lshareui.dll \
         -lglxtvout.dll \
@@ -32,14 +31,19 @@
         -lglxlogging.dll \
         -lganeswidgets.dll \
         -lglxmodelwrapper.dll \
-        -lxqsettingsmanager
+        -lglxviewutilities.dll \
+	 -lglxzoomwidget.dll \
+        -ldetailsnamelabel.dll \
+        -ldetailsnamelabelplugin.dll \
+        -ldetailsdescriptionedit.dll \
+        -ldetailsdescriptioneditplugin.dll
 
 DEFINES += BUILD_GLXVIEWS
 
 INCLUDEPATH += . ../inc \
           ../../inc \
+  	  ../widgets/glxzoomwidget/inc \
           ../uiengine/model/mediamodel/inc \
-          ../uiengine/model/listmodel/inc \
 	  ../uiengine/model/favmediamodel/inc \
           ../uiengine/medialistwrapper/inc \
           ../viewbase/inc \
@@ -48,55 +52,52 @@
           ../../traces \
           ../../tvout/tvoutwrapper/inc \
           ../uiengine/model/modelwrapper/inc \
-          /epoc32/include/mw/hgwidgets
+          ../viewutilities/effectengine/inc \
+          ../viewutilities/settingutility/inc \
+          /epoc32/include/mw/hgwidgets \
+          ../detailscustomwidget/detailsnamelabel/inc \
+          ../detailscustomwidget/detailsdescriptionedit/inc
 
 symbian: { 
 TARGET.UID3 = 0x200009EF
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 TARGET.EPOCALLOWDLLDATA = 1
 TARGET.CAPABILITY = ALL -TCB 
+MMP_RULES += SMPSAFE
 }
 
 # Input
 HEADERS += viewbase/inc/glxview.h \
            fullscreenview/inc/glxcoverflow.h \
            fullscreenview/inc/glxfullscreenview.h \
-           fullscreenview/inc/glxzoomslider.h  \
-           fullscreenview/inc/glxzoomcontrol.h  \
            detailsview/inc/glxdetailsview.h  \
-           detailsview/inc/glxdetailscustomwidgets.h  \
-           detailsview/inc/glxdetailscustomicon.h \
            gridview/inc/glxgridview.h \
-					 slideshowsettingsview/inc/glxslideshowsettingsview.h \
+           slideshowsettingsview/inc/glxslideshowsettingsview.h \
            listview/inc/glxlistview.h \
-           effectengine/inc/glxeffectengine.h \
            slideshowview/inc/glxslideshowview.h \
            slideshowview/inc/glxslideshowwidget.h \
-           effectengine/effectplugin/inc/glxeffectpluginbase.h \
-           effectengine/effectplugin/inc/glxbackwardtransitionplugin.h \
-           effectengine/effectplugin/inc/glxforwardtransitionplugin.h \
-           effectengine/effectplugin/inc/glxfadeplugin.h \
-	   	   docloaders/inc/glxviewdocloader.h \
+           docloaders/inc/glxviewdocloader.h \
            viewsfactory/inc/glxviewsfactory.h \
            
 SOURCES += viewbase/src/glxview.cpp \
            fullscreenview/src/glxcoverflow.cpp \
            fullscreenview/src/glxfullscreenview.cpp \
-           fullscreenview/src/glxzoomslider.cpp \
-           fullscreenview/src/glxzoomcontrol.cpp \
-           detailsview/src/glxdetailsview.cpp \
-           detailsview/src/glxdetailscustomwidgets.cpp \
-           detailsview/src/glxdetailscustomicon.cpp \
+	   detailsview/src/glxdetailsview.cpp \
            gridview/src/glxgridview.cpp \
            slideshowsettingsview/src/glxslideshowsettingsview.cpp \
            listview/src/glxlistview.cpp \
-           effectengine/src/glxeffectengine.cpp \
            slideshowview/src/glxslideshowview.cpp \
            slideshowview/src/glxslideshowwidget.cpp \
-           effectengine/effectplugin/src/glxbackwardtransitionplugin.cpp \
-           effectengine/effectplugin/src/glxforwardtransitionplugin.cpp \
-           effectengine/effectplugin/src/glxfadeplugin.cpp \
 	   docloaders/src/glxviewdocloader.cpp \
            viewsfactory/src/glxviewsfactory.cpp
 
-DEFINES += QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT 
\ No newline at end of file
+DEFINES += QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT 
+
+defBlock = \      
+"$${LITERAL_HASH}if defined(EABI)" \
+"DEFFILE  ../eabi/glxviews.def" \
+	 "$${LITERAL_HASH}else" \
+	 "DEFFILE  ../bwins/glxviews.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock