--- a/videocollection/videocollectionview/tsrc/testlistwidget/testlistwidget.pro	Thu Apr 01 23:13:36 2010 +0300
+++ b/videocollection/videocollectionview/tsrc/testlistwidget/testlistwidget.pro	Thu Apr 01 23:22:15 2010 +0300
@@ -15,62 +15,82 @@
 #
 
 TEMPLATE = app
-TARGET = 
+
+TARGET =
+ 
 DEPENDPATH += . \
     inc \
     src
+
 INCLUDEPATH += . \
-    /epoc32/include/domain \
-    /epoc32/include/domain/middleware \
-    /epoc32/include/domain/applications \
-    /epoc32/include/osextensions \
-    /epoc32/include/middleware \
-    /epoc32/include/osextensions/stdapis/stlport \
-    stub/inc \
+    inc \
+    ../../../tsrc/stubs/inc \
+    \ # keep these at bottom so that stub headers are taken first
     ../../../inc \
+    ../../../videocollectionview/inc \
+    ../../../videocollectionwrapper/inc \
     ../../../../inc \
+    ../../../../videoplayerapp/videoplayerengine/inc
     
 CONFIG += qtestlib \
-          symbian_test
+    Hb \
+    symbian_test
 
 LIBS += -lestor.dll \
     -lfbscli.dll \
     -lbitgdi.dll \
     -lgdi.dll \
     -lvideocollectionwrapper.dll \
-    -lxqserviceutil.dll \
+    -lxqservice.dll \
+    -lxqserviceutil.dll
 
-# Input
 HEADERS += inc/testlistwidget.h \
-           stub/inc/videosortfilterproxymodel.h \
-           stub/inc/hbmainwindow.h \
-           stub/inc/hbwidget.h \
-           stub/inc/hbinstance.h \
-           stub/inc/hbscrollbar.h \
-           stub/inc/hbaction.h \
-           stub/inc/hbwidget.h \
-           stub/inc/hbmenu.h \
-           stub/inc/hbview.h \
-           stub/inc/hblistview.h \
-           stub/inc/hblistviewitem.h \
-           stub/inc/dummydatamodel.h \
-           stub/inc/hbmessagebox.h \
-           stub/inc/videothumbnaildata.h \
-           stub/inc/videoservices.h \
-           stub/inc/videoserviceurifetch.h \
-           ../../inc/videolistwidget.h 
-               
+    \ # headers needed in test
+    ../../../videocollectionview/inc/videolistwidget.h \
+    \ # headers needed in stubs
+    ../../../tsrc/stubs/inc/hbmainwindow.h \
+    ../../../tsrc/stubs/inc/hbwidget.h \
+    ../../../tsrc/stubs/inc/hbinstance.h \
+    ../../../tsrc/stubs/inc/hbscrollbar.h \
+    ../../../tsrc/stubs/inc/hbaction.h \
+    ../../../tsrc/stubs/inc/hbview.h \
+    ../../../tsrc/stubs/inc/hblistviewitem.h \
+    ../../../tsrc/stubs/inc/hblistview.h \
+    ../../../tsrc/stubs/inc/hbglobal.h \
+    ../../../tsrc/stubs/inc/hbstyleloader.h \
+    ../../../tsrc/stubs/inc/hbmenu.h \
+    ../../../tsrc/stubs/inc/hbmessagebox.h \
+    ../../../tsrc/stubs/inc/xqserviceutil.h \
+    ../../../videocollectionview/inc/videocollectionviewutils.h \
+    ../../../videocollectionview/inc/videocollectionuiloader.h \
+    ../../../videocollectionview/inc/videolistselectiondialog.h \
+    ../../../videocollectionwrapper/inc/videocollectionwrapper.h \
+    ../../../videocollectionwrapper/inc/videosortfilterproxymodel.h \
+    ../../../videocollectionwrapper/inc/videolistdatamodel.h \
+    ../../../videocollectionwrapper/inc/videothumbnaildata.h \
+    ../../../../videoplayerapp/videoplayerengine/inc/videoserviceurifetch.h
+
 SOURCES += src/testlistwidget.cpp \
-           stub/src/hbaction.cpp \
-           stub/src/hbscrollbar.cpp \
-           stub/src/hbwidget.cpp \
-           stub/src/hblistview.cpp \
-           stub/src/hblistviewitem.cpp \
-           stub/src/hbmenu.cpp \
-           stub/src/videosortfilterproxymodel.cpp \
-           stub/src/dummydatamodel.cpp \
-           stub/src/hbmessagebox.cpp \
-           stub/src/videothumbnaildata.cpp \
-           stub/src/videoservices.cpp \
-           stub/src/videoserviceurifetch.cpp \
-           ../../src/videolistwidget.cpp
+    \ # sources needed in test
+    ../../../videocollectionview/src/videolistwidget.cpp \
+    \ # sources needed in stubs
+    ../../../tsrc/stubs/src/hbwidget.cpp \
+    ../../../tsrc/stubs/src/hbscrollbar.cpp \
+    ../../../tsrc/stubs/src/hbaction.cpp \
+    ../../../tsrc/stubs/src/hblistviewitem.cpp \
+    ../../../tsrc/stubs/src/hblistview.cpp \
+    ../../../tsrc/stubs/src/hbglobal.cpp \
+    ../../../tsrc/stubs/src/hbstyleloader.cpp \
+    ../../../tsrc/stubs/src/hbmenu.cpp \
+    ../../../tsrc/stubs/src/hbmessagebox.cpp \
+    ../../../tsrc/stubs/src/hbdialog.cpp \
+    ../../../tsrc/stubs/src/videocollectionviewutils.cpp \
+    ../../../tsrc/stubs/src/videocollectionuiloader.cpp \
+    ../../../tsrc/stubs/src/videolistselectiondialog.cpp \
+    ../../../tsrc/stubs/src/videocollectionwrapper.cpp \
+    ../../../tsrc/stubs/src/videosortfilterproxymodel.cpp \
+    ../../../tsrc/stubs/src/videolistdatamodel.cpp \
+    ../../../tsrc/stubs/src/videothumbnaildata.cpp \
+    ../../../tsrc/stubs/src/videoservices.cpp \
+    ../../../tsrc/stubs/src/videoserviceurifetch.cpp \
+    
\ No newline at end of file