--- a/videocollection/videocollectionview/tsrc/testvideolistselectiondialog/testvideolistselectiondialog.pro	Thu Apr 01 23:13:36 2010 +0300
+++ b/videocollection/videocollectionview/tsrc/testvideolistselectiondialog/testvideolistselectiondialog.pro	Thu Apr 01 23:22:15 2010 +0300
@@ -1,67 +1,74 @@
-# #####################################################################
-# Automatically generated by qmake (2.01a) Tue 5. May 13:25:42 2009
-# #####################################################################
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 TEMPLATE = app
+
 TARGET = 
+
 DEPENDPATH += . \
     inc \
-    src \
-    stub\inc \
-    stub\src \
+    src
     
-INCLUDEPATH =   inc \
-                stub/inc \
-	            /epoc32/include \
-	            /epoc32/include/osextensions/stdapis \
-	            /epoc32/include/osextensions/stdapis/sys \
-	            /epoc32/include/stdapis \
-	            /epoc32/include/stdapis/sys \
-                . \
-                /epoc32/include \
-                /epoc32/include/domain \
-                /epoc32/include/domain/middleware \
-                /epoc32/include/domain/applications \
-                /epoc32/include/osextensions \
-                /epoc32/include/middleware \
-                /epoc32/include/osextensions/stdapis/stlport \
-                ../../../inc
+INCLUDEPATH = . \ 
+    inc \
+    ../../../tsrc/stubs/inc \
+    \ # keep these at bottom so that stub headers are taken first
+    ../../../inc \
+    ../../../videocollectionview/inc \
+    ../../../videocollectionwrapper/inc
     
 CONFIG += qtestlib \
-          symbian_test
+    hb \
+    symbian_test
 
 LIBS += -lestor.dll \
     -lfbscli.dll \
     -lbitgdi.dll \
     -lgdi.dll
 
-# Input
-HEADERS +=  inc/testvideolistselectiondialog.h \
-            stub/inc/videocollectionwrapper.h \
-            stub/inc/videolistwidget.h \
-            stub/inc/hbdialog.h \            
-            stub/inc/hblabel.h \
-            stub/inc/hbcheckbox.h \
-            stub/inc/hbstackedwidget.h \
-            stub/inc/hbdeviceprofile.h \            
-            stub/inc/hbaction.h \
-            stub/inc/hbwidget.h \
-            stub/inc/hbview.h \
-            stub/inc/hbabstractitemview.h \
-            stub/inc/videocollectionuiloader.h \  
-            stub/inc/dummydatamodel.h \        
-            stub/inc/videosortfilterproxymodel.h \            
-            ../../inc/videolistselectiondialog.h
+HEADERS += inc/testvideolistselectiondialog.h \
+    \ # headers needed in test
+    ../../inc/videolistselectiondialog.h \
+    \ # headers needed in stubs
+    ../../../tsrc/stubs/inc/hbdialog.h \            
+    ../../../tsrc/stubs/inc/hblabel.h \
+    ../../../tsrc/stubs/inc/hbcheckbox.h \
+    ../../../tsrc/stubs/inc/hbwidget.h \
+    ../../../tsrc/stubs/inc/hbstackedwidget.h \
+    ../../../tsrc/stubs/inc/hbdeviceprofile.h \
+    ../../../tsrc/stubs/inc/hbabstractitemview.h \
+    ../../../tsrc/stubs/inc/hbaction.h \
+    ../../../tsrc/stubs/inc/hbview.h \
+    ../../../videocollectionview/inc/videolistwidget.h \
+    ../../../videocollectionview/inc/videocollectionuiloader.h \
+    ../../../videocollectionwrapper/inc/videocollectionwrapper.h \
+    ../../../videocollectionwrapper/inc/videolistdatamodel.h \        
+    ../../../videocollectionwrapper/inc/videosortfilterproxymodel.h            
     
 SOURCES += src/testvideolistselectiondialog.cpp \           
-           stub/src/videolistwidget.cpp \
-           stub/src/hbdialog.cpp \
-           stub/src/hbstackedwidget.cpp \
-           stub/src/hblabel.cpp \
-           stub/src/hbcheckbox.cpp \
-           stub/src/hbwidget.cpp \
-           stub/src/hbaction.cpp \           
-           stub/src/videocollectionuiloader.cpp \
-           stub/src/videosortfilterproxymodel.cpp \  
-           stub/src/dummydatamodel.cpp \           
-           ../../src/videolistselectiondialog.cpp \
-           
+    \ # sources needed in test
+    ../../src/videolistselectiondialog.cpp \
+    \ # sources needed in stubs
+    ../../../tsrc/stubs/src/hbdialog.cpp \
+    ../../../tsrc/stubs/src/hblabel.cpp \
+    ../../../tsrc/stubs/src/hbcheckbox.cpp \
+    ../../../tsrc/stubs/src/hbwidget.cpp \
+    ../../../tsrc/stubs/src/hbstackedwidget.cpp \
+    ../../../tsrc/stubs/src/hbaction.cpp \
+    ../../../tsrc/stubs/src/videolistwidget.cpp \
+    ../../../tsrc/stubs/src/videocollectionuiloader.cpp \
+    ../../../tsrc/stubs/src/videosortfilterproxymodel.cpp \  
+    ../../../tsrc/stubs/src/videolistdatamodel.cpp