--- a/taskswitcherapp/common.pri	Fri Mar 19 09:27:44 2010 +0200
+++ b/taskswitcherapp/common.pri	Fri Apr 16 14:54:01 2010 +0300
@@ -36,8 +36,6 @@
 win32: OUTPUT_DIR = $$PWD/../../bin/$$SUBDIRPART
 symbian: OUTPUT_DIR = $$PWD/bin
 
-SOURCE_DIR = $$PWD/inc
-
 #test whether we have a unit test
 !testcase {
     OBJECTS_DIR = $$OUTPUT_DIR/tmp/$$TARGET
@@ -49,19 +47,24 @@
     QT *= testlib
     CONFIG += console
     CONFIG -= app_bundle
-    OBJECTS_DIR = $$OUTPUT_DIR/bin/tests/$$SUBDIRPART/tmp/$$TARGET
-    DESTDIR = $$OUTPUT_DIR/bin/tests/$$SUBDIRPART
-    MOC_DIR = $$OUTPUT_DIR/bin/tests/$$SUBDIRPART/tmp/$$TARGET/moc
-    RCC_DIR = $$OUTPUT_DIR/bin/tests/$$SUBDIRPART/tmp/$$TARGET/rcc
-    UI_DIR = $$OUTPUT_DIR/bin/tests/$$SUBDIRPART/tmp/$$TARGET/ui
-    LIBS += -L$$OUTPUT_DIR/bin/$$SUBDIRPART/bin  #link against library that we test
+    OBJECTS_DIR = $$OUTPUT_DIR/tests/tmp/$$TARGET
+    DESTDIR = $$OUTPUT_DIR
+    MOC_DIR = $$OUTPUT_DIR/tests/tmp/$$TARGET/moc
+    RCC_DIR = $$OUTPUT_DIR/tests/tmp/$$TARGET/rcc
+    UI_DIR = $$OUTPUT_DIR/tests/tmp/$$TARGET/ui
+    coverage {
+        DEFINES += COVERAGE_MEASUREMENT
+        DEFINES += QT_NO_DEBUG  # omit ASSERTS in coverage measurements
+    }
+    
+    symbian {
+        TARGET.SID = 0x2002677D
+    }
 }
 
 # Add the output dirs to the link path too
 LIBS += -L$$DESTDIR
 
-DEPENDPATH += . $$SOURCE_DIR
-INCLUDEPATH += . $$SOURCE_DIR
 #For some reason the default include path doesn't include MOC_DIR on symbian
 symbian {
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
@@ -73,70 +76,6 @@
 win32 {
     # add platfrom API for windows
     INCLUDEPATH += \
-                $$PWD/../../homescreensrv/homescreensrv_plat/appruntimemodel_api \
                 $$PWD/../../homescreensrv/homescreensrv_plat/contentstorage_api \
                 $$PWD/../../homescreensrv/homescreensrv_plat/hswidgetmodel_api \
-                $$PWD/../../homescreensrv/homescreensrv_plat/servicemodel_api \
-                $$PWD/../../homescreensrv/homescreensrv_plat/statemodel_api
 }
-
-plugin: !isEmpty(PLUGIN_SUBDIR): DESTDIR = $$OUTPUT_DIR/$$PLUGIN_SUBDIR
-
-win32: plugin { # copy manifiers
-    manifest.path = $$DESTDIR
-    manifest.files = ./resource/*.manifest
-    manifest.CONFIG += no_build
-
-    INSTALLS += manifest
-    PRE_TARGETDEPS += install_manifest
-
-}
-
-symbian: plugin { # copy qtstub and manifest
-
-    pluginstub.sources = $${TARGET}.dll
-    pluginstub.path = $$PLUGIN_SUBDIR
-
-    manifest.sources = resource/$${TARGET}.manifest
-    manifest.path = $$PLUGIN_SUBDIR
-    
-    DEPLOYMENT += pluginstub manifest
-
-    qtplugins.path = $$PLUGIN_SUBDIR
-    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-    qtplugins.sources += resource/$${TARGET}.manifest
-
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin z:$$qtplugins.path/$$basename(qtplugin)"
-
-}
-
-defineTest(exportResources) {
-symbian {
-    for(subdirs, 1) {
-        entries = $$files($$subdirs)
-        for(entry, entries) : BLD_INF_RULES.prj_exports += "./$$entry z:/$$replace(2, ^/,)/$$basename(entry)"
-    }
-    export ( BLD_INF_RULES.prj_exports)
-}
-win32 {
-    name = $$replace(1, [/\\\\\.\*], _)
-    eval ($${name}.path = $${OUTPUT_DIR}/$${2})
-    eval ($${name}.files = $$1)
-    eval ($${name}.CONFIG += no_build)
-
-    INSTALLS += $$name
-    PRE_TARGETDEPS += install_$${name}
-
-    export ( $${name}.path )
-    export ( $${name}.files )
-    export ( $${name}.CONFIG )
-    export ( INSTALLS )
-    export ( PRE_TARGETDEPS )
-}
-}
-
-# support for NFT
-nft:DEFINES += NFT
-
-#ONLY FOR DEVELOPMENT! REMOVE THIS AFTER SPRINTS ENDS AT WK43 2009!
-symbian: MMP_RULES += EXPORTUNFROZEN
\ No newline at end of file