Revert "Changes: Tests: relative paths to ../../src in .pro files changed to $$MSRCDIR"

This reverts commit 61f0c005a73c60bd7bdc58a28cec9faadf94e10e.

36 files changed, 117 insertions, 124 deletions

diff --git a/benchmarks/common_top.pri b/benchmarks/common_top.pri
index 1ead9fb9..c9821989 100644
--- a/benchmarks/common_top.pri
+++ b/benchmarks/common_top.pri
@@ -1,7 +1,7 @@
 # for defines
 include(../mkspecs/common.pri)
 
-MSRCDIR = $${M_SOURCE_TREE}/src
+MSRCDIR = ../../src/
 STUBSDIR = ../stubs
 INCLUDEPATH += \
     . \
diff --git a/benchmarks/mt_mbutton/mt_mbutton.pro b/benchmarks/mt_mbutton/mt_mbutton.pro
index d41a3026..b06d7d45 100644
--- a/benchmarks/mt_mbutton/mt_mbutton.pro
+++ b/benchmarks/mt_mbutton/mt_mbutton.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = mt_mbutton
 
 SOURCES += mt_mbutton.cpp
diff --git a/benchmarks/mt_mbuttongroup/mt_mbuttongroup.pro b/benchmarks/mt_mbuttongroup/mt_mbuttongroup.pro
index f73796ec..56d188af 100644
--- a/benchmarks/mt_mbuttongroup/mt_mbuttongroup.pro
+++ b/benchmarks/mt_mbuttongroup/mt_mbuttongroup.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = mt_mbuttongroup
 
 SOURCES += mt_mbuttongroup.cpp
diff --git a/benchmarks/mt_mdialog/mt_mdialog.pro b/benchmarks/mt_mdialog/mt_mdialog.pro
index 16b65f29..9ef38bf1 100644
--- a/benchmarks/mt_mdialog/mt_mdialog.pro
+++ b/benchmarks/mt_mdialog/mt_mdialog.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = mt_mdialog
 
 SOURCES += mt_mdialog.cpp
diff --git a/benchmarks/mt_mimagewidget/mt_mimagewidget.pro b/benchmarks/mt_mimagewidget/mt_mimagewidget.pro
index d0f945bd..b7a3b488 100644
--- a/benchmarks/mt_mimagewidget/mt_mimagewidget.pro
+++ b/benchmarks/mt_mimagewidget/mt_mimagewidget.pro
@@ -1,7 +1,7 @@
 
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = mt_mimagewidget
 
 SOURCES += mt_mimagewidget.cpp
diff --git a/benchmarks/mt_mlabel/mt_mlabel.pro b/benchmarks/mt_mlabel/mt_mlabel.pro
index 3af7723a..ecdf2918 100644
--- a/benchmarks/mt_mlabel/mt_mlabel.pro
+++ b/benchmarks/mt_mlabel/mt_mlabel.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = mt_mlabel
 
 SOURCES += mt_mlabel.cpp
diff --git a/benchmarks/mt_mlist/mt_mlist.pro b/benchmarks/mt_mlist/mt_mlist.pro
index 475fe916..11ae8ce4 100644
--- a/benchmarks/mt_mlist/mt_mlist.pro
+++ b/benchmarks/mt_mlist/mt_mlist.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = mt_mlist
 
 SOURCES += mt_mlist.cpp
diff --git a/benchmarks/mt_mmenu/mt_mmenu.pro b/benchmarks/mt_mmenu/mt_mmenu.pro
index aab8e8c7..64762633 100644
--- a/benchmarks/mt_mmenu/mt_mmenu.pro
+++ b/benchmarks/mt_mmenu/mt_mmenu.pro
@@ -1,7 +1,7 @@
 
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = mt_mmenu
 
 SOURCES += mt_mmenu.cpp
diff --git a/benchmarks/mt_mprogressindicator/mt_mprogressindicator.pro b/benchmarks/mt_mprogressindicator/mt_mprogressindicator.pro
index dff855da..8b39bcf4 100644
--- a/benchmarks/mt_mprogressindicator/mt_mprogressindicator.pro
+++ b/benchmarks/mt_mprogressindicator/mt_mprogressindicator.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = mt_mprogressindicator
 
 SOURCES += mt_mprogressindicator.cpp
diff --git a/benchmarks/mt_mtoolbar/mt_mtoolbar.pro b/benchmarks/mt_mtoolbar/mt_mtoolbar.pro
index ccf33016..74e798db 100644
--- a/benchmarks/mt_mtoolbar/mt_mtoolbar.pro
+++ b/benchmarks/mt_mtoolbar/mt_mtoolbar.pro
@@ -1,7 +1,7 @@
 
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = mt_mtoolbar
 
 SOURCES += mt_mtoolbar.cpp
diff --git a/benchmarks/pt_mbutton/pt_mbutton.pro b/benchmarks/pt_mbutton/pt_mbutton.pro
index 7602bca2..6d0fc89a 100644
--- a/benchmarks/pt_mbutton/pt_mbutton.pro
+++ b/benchmarks/pt_mbutton/pt_mbutton.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/corelib/theme
+INCLUDEPATH += ../../src/include ../../src/corelib/theme
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mbutton
 
diff --git a/benchmarks/pt_mcomponentdata/pt_mcomponentdata.pro b/benchmarks/pt_mcomponentdata/pt_mcomponentdata.pro
index a49dae5b..662d276e 100644
--- a/benchmarks/pt_mcomponentdata/pt_mcomponentdata.pro
+++ b/benchmarks/pt_mcomponentdata/pt_mcomponentdata.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mcomponentdata
 
diff --git a/benchmarks/pt_micontestcase/pt_micontestcase.pro b/benchmarks/pt_micontestcase/pt_micontestcase.pro
index b31c74b5..dc2907ba 100644
--- a/benchmarks/pt_micontestcase/pt_micontestcase.pro
+++ b/benchmarks/pt_micontestcase/pt_micontestcase.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = pt_micontestcase
 
 SOURCES += pt_micontestcase.cpp
diff --git a/benchmarks/pt_mimagewidget/pt_mimagewidget.pro b/benchmarks/pt_mimagewidget/pt_mimagewidget.pro
index 2912c27b..a188f0ab 100644
--- a/benchmarks/pt_mimagewidget/pt_mimagewidget.pro
+++ b/benchmarks/pt_mimagewidget/pt_mimagewidget.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mimagewidget
 
diff --git a/benchmarks/pt_mlabel/pt_mlabel.pro b/benchmarks/pt_mlabel/pt_mlabel.pro
index ea2631e3..4961c0ec 100644
--- a/benchmarks/pt_mlabel/pt_mlabel.pro
+++ b/benchmarks/pt_mlabel/pt_mlabel.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = pt_mlabel
 
 SOURCES += pt_mlabel.cpp
diff --git a/benchmarks/pt_mmenu/pt_mmenu.pro b/benchmarks/pt_mmenu/pt_mmenu.pro
index 4d638cd3..802ae318 100644
--- a/benchmarks/pt_mmenu/pt_mmenu.pro
+++ b/benchmarks/pt_mmenu/pt_mmenu.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/theme
+INCLUDEPATH += ../../src/include ../../src/theme
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mmenu
 
diff --git a/benchmarks/pt_mprogressindicator/pt_mprogressindicator.pro b/benchmarks/pt_mprogressindicator/pt_mprogressindicator.pro
index ea467435..0aa5a51e 100644
--- a/benchmarks/pt_mprogressindicator/pt_mprogressindicator.pro
+++ b/benchmarks/pt_mprogressindicator/pt_mprogressindicator.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/widgets/views
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include ../../src/widgets/views
+DEPENDPATH += ../../src/include
 TARGET = pt_mprogressindicator
 
 SOURCES += pt_mprogressindicator.cpp
diff --git a/benchmarks/pt_mscalableimage/pt_mscalableimage.pro b/benchmarks/pt_mscalableimage/pt_mscalableimage.pro
index 22c6b0b8..bf1d777c 100644
--- a/benchmarks/pt_mscalableimage/pt_mscalableimage.pro
+++ b/benchmarks/pt_mscalableimage/pt_mscalableimage.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/theme $$MSRCDIR/painting
+INCLUDEPATH += ../../src/include ../../src/theme ../../src/painting
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mscalableimage
 
diff --git a/benchmarks/pt_mslider/pt_mslider.pro b/benchmarks/pt_mslider/pt_mslider.pro
index b6c14226..e25e9858 100644
--- a/benchmarks/pt_mslider/pt_mslider.pro
+++ b/benchmarks/pt_mslider/pt_mslider.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
-DEPENDPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
+DEPENDPATH += ../../src/include
 TARGET = pt_mslider
 
 SOURCES += pt_mslider.cpp
diff --git a/benchmarks/pt_mtheme/pt_mtheme.pro b/benchmarks/pt_mtheme/pt_mtheme.pro
index ba8d9cd3..49adb4c9 100644
--- a/benchmarks/pt_mtheme/pt_mtheme.pro
+++ b/benchmarks/pt_mtheme/pt_mtheme.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include
+INCLUDEPATH += ../../src/include
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mtheme
 
diff --git a/benchmarks/pt_mtoolbar/pt_mtoolbar.pro b/benchmarks/pt_mtoolbar/pt_mtoolbar.pro
index c7872848..5dffc804 100644
--- a/benchmarks/pt_mtoolbar/pt_mtoolbar.pro
+++ b/benchmarks/pt_mtoolbar/pt_mtoolbar.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/theme
+INCLUDEPATH += ../../src/include ../../src/theme
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mtoolbar
 
diff --git a/tests/common_top.pri b/tests/common_top.pri
index 6d3a6f69..1e1da6d6 100644
--- a/tests/common_top.pri
+++ b/tests/common_top.pri
@@ -8,7 +8,7 @@ include(../src/predeps.pri)
 include(../mkspecs/features/meegotouch_mmoc.prf)
 include(../mkspecs/features/meegotouch_mgen.prf)
 
-MSRCDIR = $${M_SOURCE_TREE}/src
+MSRCDIR = ../../src
 STUBSDIR = ../stubs
 INCLUDEPATH += \
     . \
diff --git a/tests/ft_mstylesheet/ft_mstylesheet.pro b/tests/ft_mstylesheet/ft_mstylesheet.pro
index 419c3605..9280a741 100644
--- a/tests/ft_mstylesheet/ft_mstylesheet.pro
+++ b/tests/ft_mstylesheet/ft_mstylesheet.pro
@@ -7,8 +7,8 @@ STYLE_HEADERS += testobjectstyle.h testobject2style.h testobject3style.h
 
 SOURCES += \
 	ft_mstylesheet.cpp \
-    $$MSRCDIR/corelib/theme/mlogicalvalues.cpp \
-    $$MSRCDIR/corelib/style/mstylesheetattribute.cpp
+    ../../src/corelib/theme/mlogicalvalues.cpp \
+    ../../src/corelib/style/mstylesheetattribute.cpp
 
 HEADERS += \
 	ft_mstylesheet.h \
@@ -18,8 +18,8 @@ HEADERS += \
     testwidget.h \
     testwidget2.h \
     testwidget3.h \
-    $$MSRCDIR/corelib/theme/mlogicalvalues.h \
-    $$MSRCDIR/corelib/style/mstylesheetattribute.h \
+    ../../src/corelib/theme/mlogicalvalues.h \
+    ../../src/corelib/style/mstylesheetattribute.h \
     $$STYLE_HEADERS
 
 support_files.files += \
diff --git a/tests/ft_mstylesheetparser/ft_mstylesheetparser.pro b/tests/ft_mstylesheetparser/ft_mstylesheetparser.pro
index 3ca575a4..6812b569 100644
--- a/tests/ft_mstylesheetparser/ft_mstylesheetparser.pro
+++ b/tests/ft_mstylesheetparser/ft_mstylesheetparser.pro
@@ -5,14 +5,14 @@ LIBRARYPATH += $$MSRCDIR
 
 SOURCES += \
 	ft_mstylesheetparser.cpp \
-    $$MSRCDIR/corelib/theme/mlogicalvalues.cpp \
-    $$MSRCDIR/corelib/style/mstylesheetattribute.cpp
+    ../../src/corelib/theme/mlogicalvalues.cpp \
+    ../../src/corelib/style/mstylesheetattribute.cpp
 
 
 HEADERS += \
 	ft_mstylesheetparser.h \
-        $$MSRCDIR/corelib/theme/mlogicalvalues.h \
-        $$MSRCDIR/corelib/style/mstylesheetattribute.h
+	../../src/corelib/theme/mlogicalvalues.h \
+	../../src/corelib/style/mstylesheetattribute.h
 
 support_files.files += \
         *.css \
diff --git a/tests/ut_mabstractitemmodel/ut_mabstractitemmodel.pro b/tests/ut_mabstractitemmodel/ut_mabstractitemmodel.pro
index 76d7af4e..4a078c18 100644
--- a/tests/ut_mabstractitemmodel/ut_mabstractitemmodel.pro
+++ b/tests/ut_mabstractitemmodel/ut_mabstractitemmodel.pro
@@ -2,7 +2,7 @@ include(../common_top.pri)
 
 TARGET = ut_mabstractitemmodel
 
-INCLUDEPATH += $$MSRCDIR/corelib/widgets \
+INCLUDEPATH += ../../src/corelib/widgets \
 
 HEADERS += ut_mabstractitemmodel.h \
 
diff --git a/tests/ut_mcombobox/ut_mcombobox.pro b/tests/ut_mcombobox/ut_mcombobox.pro
index a15467b1..ee04b5f8 100644
--- a/tests/ut_mcombobox/ut_mcombobox.pro
+++ b/tests/ut_mcombobox/ut_mcombobox.pro
@@ -7,17 +7,17 @@ TARGET = ut_mcombobox
 # unit test and unit
 SOURCES += \
     ut_mcombobox.cpp \
-    $$MSRCDIR/views/mcomboboxview.cpp \
-    $$MSRCDIR/views/widgets/mcomboboxbutton.cpp \
+    ../../src/views/mcomboboxview.cpp \
+    ../../src/views/widgets/mcomboboxbutton.cpp \
 
 # unit test and unit
 HEADERS += \
     ut_mcombobox.h
 
 INCLUDEPATH += \
-    $$MSRCDIR/corelib/widgets \
-    $$MSRCDIR/views \
-    $$MSRCDIR/views/widgets \
-    $$MSRCDIR/views/.moc \
+    ../../src/corelib/widgets \
+    ../../src/views \
+    ../../src/views/widgets \
+    ../../src/views/.moc \
 
 include(../common_bot.pri)
diff --git a/tests/ut_mlistviewgroupheader/ut_mlistviewgroupheader.pro b/tests/ut_mlistviewgroupheader/ut_mlistviewgroupheader.pro
index c77d88be..1f876ac9 100644
--- a/tests/ut_mlistviewgroupheader/ut_mlistviewgroupheader.pro
+++ b/tests/ut_mlistviewgroupheader/ut_mlistviewgroupheader.pro
@@ -3,26 +3,26 @@ include(../common_top.pri)
 TARGET = ut_mlistviewgroupheader
 
 INCLUDEPATH += ../mlistviewcommon \
-        $$MSRCDIR/corelib/widgets \
-        $$MSRCDIR/views/widgets \
-        $$MSRCDIR/views \
-        $$MSRCDIR/corelib/.gen
+        ../../src/corelib/widgets \
+        ../../src/views/widgets \
+        ../../src/views \
+        ../../src/corelib/.gen
 
 HEADERS += ut_mlistviewgroupheader.h \
         ../mlistviewcommon/myindexedmodel.h \
-        $$MSRCDIR/views/widgets/mlistindexmodel.h \
-        $$MSRCDIR/views/style/mlistindexstyle.h \
+        ../../src/views/widgets/mlistindexmodel.h \
+        ../../src/views/style/mlistindexstyle.h \
 
 SOURCES += ut_mlistviewgroupheader.cpp  \
         ../mlistviewcommon/myindexedmodel.cpp \
-        $$MSRCDIR/views/mlistview_p.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistview_p.cpp \
-        $$MSRCDIR/views/widgets/mlistindex.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistindex.cpp \
-        $$MSRCDIR/views/.gen/gen_mlistindexmodeldata.cpp \
-        $$MSRCDIR/views/mlistindexview.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistindexview.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistindexview_p.cpp \
-        $$MSRCDIR/views/.gen/gen_mlistindexstyledata.cpp \
+        ../../src/views/mlistview_p.cpp \
+        ../../src/views/.moc/moc_mlistview_p.cpp \
+        ../../src/views/widgets/mlistindex.cpp \
+        ../../src/views/.moc/moc_mlistindex.cpp \
+        ../../src/views/.gen/gen_mlistindexmodeldata.cpp \
+        ../../src/views/mlistindexview.cpp \
+        ../../src/views/.moc/moc_mlistindexview.cpp \
+        ../../src/views/.moc/moc_mlistindexview_p.cpp \
+        ../../src/views/.gen/gen_mlistindexstyledata.cpp \
 
 include(../common_bot.pri)
diff --git a/tests/ut_mlistviewmulticolumn/ut_mlistviewmulticolumn.pro b/tests/ut_mlistviewmulticolumn/ut_mlistviewmulticolumn.pro
index 52fd8bf3..0c5d197b 100644
--- a/tests/ut_mlistviewmulticolumn/ut_mlistviewmulticolumn.pro
+++ b/tests/ut_mlistviewmulticolumn/ut_mlistviewmulticolumn.pro
@@ -3,26 +3,26 @@ include(../common_top.pri)
 TARGET = ut_mlistviewmulticolumn
 
 INCLUDEPATH += ../mlistviewcommon \
-        $$MSRCDIR/corelib/widgets \
-        $$MSRCDIR/views/widgets \
-        $$MSRCDIR/views \
-        $$MSRCDIR/corelib/.gen
+        ../../src/corelib/widgets \
+        ../../src/views/widgets \
+        ../../src/views \
+        ../../src/corelib/.gen
 
 HEADERS += ut_mlistviewmulticolumn.h \
         ../mlistviewcommon/myindexedmodel.h \
-        $$MSRCDIR/views/widgets/mlistindexmodel.h \
-        $$MSRCDIR/views/style/mlistindexstyle.h \
+        ../../src/views/widgets/mlistindexmodel.h \
+        ../../src/views/style/mlistindexstyle.h \
 
 SOURCES += ut_mlistviewmulticolumn.cpp  \
         ../mlistviewcommon/myindexedmodel.cpp \
-        $$MSRCDIR/views/mlistview_p.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistview_p.cpp \
-        $$MSRCDIR/views/widgets/mlistindex.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistindex.cpp \
-        $$MSRCDIR/views/.gen/gen_mlistindexmodeldata.cpp \
-        $$MSRCDIR/views/mlistindexview.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistindexview.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistindexview_p.cpp \
-        $$MSRCDIR/views/.gen/gen_mlistindexstyledata.cpp \
+        ../../src/views/mlistview_p.cpp \
+        ../../src/views/.moc/moc_mlistview_p.cpp \
+        ../../src/views/widgets/mlistindex.cpp \
+        ../../src/views/.moc/moc_mlistindex.cpp \
+        ../../src/views/.gen/gen_mlistindexmodeldata.cpp \
+        ../../src/views/mlistindexview.cpp \
+        ../../src/views/.moc/moc_mlistindexview.cpp \
+        ../../src/views/.moc/moc_mlistindexview_p.cpp \
+        ../../src/views/.gen/gen_mlistindexstyledata.cpp \
 
 include(../common_bot.pri)
diff --git a/tests/ut_mlistviewplain/ut_mlistviewplain.pro b/tests/ut_mlistviewplain/ut_mlistviewplain.pro
index 84650ea1..6373d41f 100644
--- a/tests/ut_mlistviewplain/ut_mlistviewplain.pro
+++ b/tests/ut_mlistviewplain/ut_mlistviewplain.pro
@@ -6,8 +6,8 @@ INCLUDEPATH += ../ut_mlistviewcommon
 HEADERS += ut_mlistviewplain.h
 
 SOURCES += ut_mlistviewplain.cpp  \
-        $$MSRCDIR/corelib/widgets/views/mlistview_p.cpp \
-        $$MSRCDIR/corelib/widgets/mcell.cpp \
-        $$MSRCDIR/corelib/.moc/moc_mlistview_p.cpp
+        ../../src/corelib/widgets/views/mlistview_p.cpp \
+        ../../src/corelib/widgets/mcell.cpp \
+        ../../src/corelib/.moc/moc_mlistview_p.cpp
 
 include(../common_bot.pri)
diff --git a/tests/ut_mlistviewseparators/ut_mlistviewseparators.pro b/tests/ut_mlistviewseparators/ut_mlistviewseparators.pro
index 570eb0a8..f838db0c 100644
--- a/tests/ut_mlistviewseparators/ut_mlistviewseparators.pro
+++ b/tests/ut_mlistviewseparators/ut_mlistviewseparators.pro
@@ -3,27 +3,27 @@ include(../common_top.pri)
 TARGET = ut_mlistviewseparators
 
 INCLUDEPATH += ../mlistviewcommon \
-        $$MSRCDIR/corelib/widgets \
-        $$MSRCDIR/views/widgets \
-        $$MSRCDIR/views \
-        $$MSRCDIR/corelib/.gen
+        ../../src/corelib/widgets \
+        ../../src/views/widgets \
+        ../../src/views \
+        ../../src/corelib/.gen
 
 HEADERS += ut_mlistviewseparators.h \
         ../mlistviewcommon/myindexedmodel.h \
-        $$MSRCDIR/views/widgets/mlistindexmodel.h \
-        $$MSRCDIR/views/style/mlistindexstyle.h \
+        ../../src/views/widgets/mlistindexmodel.h \
+        ../../src/views/style/mlistindexstyle.h \
 
 SOURCES += ut_mlistviewseparators.cpp  \
         ../mlistviewcommon/myindexedmodel.cpp \
-        $$MSRCDIR/views/mlistview_p.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistview_p.cpp \
-        $$MSRCDIR/views/widgets/mlistindex.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistindex.cpp \
-        $$MSRCDIR/views/.gen/gen_mlistindexmodeldata.cpp \
-        $$MSRCDIR/views/mlistindexview.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistindexview.cpp \
-        $$MSRCDIR/views/.moc/moc_mlistindexview_p.cpp \
-        $$MSRCDIR/views/.gen/gen_mlistindexstyledata.cpp \
+        ../../src/views/mlistview_p.cpp \
+        ../../src/views/.moc/moc_mlistview_p.cpp \
+        ../../src/views/widgets/mlistindex.cpp \
+        ../../src/views/.moc/moc_mlistindex.cpp \
+        ../../src/views/.gen/gen_mlistindexmodeldata.cpp \
+        ../../src/views/mlistindexview.cpp \
+        ../../src/views/.moc/moc_mlistindexview.cpp \
+        ../../src/views/.moc/moc_mlistindexview_p.cpp \
+        ../../src/views/.gen/gen_mlistindexstyledata.cpp \
 
 
 include(../common_bot.pri)
diff --git a/tests/ut_mlogicalvalues/ut_mlogicalvalues.pro b/tests/ut_mlogicalvalues/ut_mlogicalvalues.pro
index cac868ca..925f21f2 100644
--- a/tests/ut_mlogicalvalues/ut_mlogicalvalues.pro
+++ b/tests/ut_mlogicalvalues/ut_mlogicalvalues.pro
@@ -5,14 +5,14 @@ LIBRARYPATH += $$MSRCDIR
 
 SOURCES += \
 	ut_mlogicalvalues.cpp \
-    $$MSRCDIR/corelib/theme/mlogicalvalues.cpp \
-    $$MSRCDIR/corelib/style/mstylesheetattribute.cpp
+    ../../src/corelib/theme/mlogicalvalues.cpp \
+    ../../src/corelib/style/mstylesheetattribute.cpp
 
 HEADERS += \
 	ut_mlogicalvalues.h \
-        $$MSRCDIR/corelib/theme/mlogicalvalues.h \
-        $$MSRCDIR/corelib/theme/mlogicalvalues_p.h \
-        $$MSRCDIR/corelib/style/mstylesheetattribute.h
+	../../src/corelib/theme/mlogicalvalues.h \
+	../../src/corelib/theme/mlogicalvalues_p.h \
+	../../src/corelib/style/mstylesheetattribute.h
 
 support_files.files += *.ini
 
diff --git a/tests/ut_mmulticolumnlistview/ut_mmulticolumnlistview.pro b/tests/ut_mmulticolumnlistview/ut_mmulticolumnlistview.pro
index 9c41c0f0..e9af2134 100644
--- a/tests/ut_mmulticolumnlistview/ut_mmulticolumnlistview.pro
+++ b/tests/ut_mmulticolumnlistview/ut_mmulticolumnlistview.pro
@@ -2,14 +2,7 @@ include(../common_top.pri)
 
 TARGET = ut_mmulticolumnlistview
 
-HEADERS += \
-    ut_mmulticolumnlistview.h \
-    myindexedmodel.h
-
-SOURCES += \
-    ut_mmulticolumnlistview.cpp \
-    myindexedmodel.cpp \
-    $$MSRCDIR/corelib/widgets/views/mlistview_p.cpp \
-    $$MSRCDIR/corelib/.moc/moc_mlistview_p.cpp
+HEADERS += ut_mmulticolumnlistview.h myindexedmodel.h
+SOURCES += ut_mmulticolumnlistview.cpp myindexedmodel.cpp ../../src/corelib/widgets/views/mlistview_p.cpp ../../src/corelib/.moc/moc_mlistview_p.cpp
 
 include(../common_bot.pri)
diff --git a/tests/ut_mpanrecognizer/ut_mpanrecognizer.pro b/tests/ut_mpanrecognizer/ut_mpanrecognizer.pro
index e3bec2a3..c083b280 100644
--- a/tests/ut_mpanrecognizer/ut_mpanrecognizer.pro
+++ b/tests/ut_mpanrecognizer/ut_mpanrecognizer.pro
@@ -5,12 +5,12 @@ TARGET = ut_mpanrecognizer
 # unit test and unit classes
 SOURCES += \
     ut_mpanrecognizer.cpp \
-    $$MSRCDIR/corelib/events/mpanrecognizer.cpp \
-    $$MSRCDIR/corelib/events/mpangesture.cpp \
+    ../../src/corelib/events/mpanrecognizer.cpp \
+    ../../src/corelib/events/mpangesture.cpp \
     
 # unit test and unit classes
 HEADERS += \
     ut_mpanrecognizer.h \
-    $$MSRCDIR/corelib/events/mpangesture_p.h \
+    ../../src/corelib/events/mpangesture_p.h \
 
 include(../common_bot.pri)
diff --git a/tests/ut_mphysics2dpanning/ut_mphysics2dpanning.pro b/tests/ut_mphysics2dpanning/ut_mphysics2dpanning.pro
index 3f0f96bd..ddc5ac57 100644
--- a/tests/ut_mphysics2dpanning/ut_mphysics2dpanning.pro
+++ b/tests/ut_mphysics2dpanning/ut_mphysics2dpanning.pro
@@ -7,7 +7,7 @@ TARGET = ut_mphysics2dpanning
 # unit test and unit
 SOURCES += \
     ut_mphysics2dpanning.cpp \
-    $$MSRCDIR/corelib/widgets/mphysics2dpanning.cpp \
+    ../../src/corelib/widgets/mphysics2dpanning.cpp \
 
 # unit test and unit
 HEADERS += \
diff --git a/tests/ut_mpopuplist/ut_mpopuplist.pro b/tests/ut_mpopuplist/ut_mpopuplist.pro
index 60b9a3e6..f126120c 100644
--- a/tests/ut_mpopuplist/ut_mpopuplist.pro
+++ b/tests/ut_mpopuplist/ut_mpopuplist.pro
@@ -6,16 +6,16 @@ TARGET = ut_mpopuplist
 # unit test and unit
 SOURCES += \
     ut_mpopuplist.cpp \
-    $$MSRCDIR/views/mdialogview.cpp \
-    $$MSRCDIR/views/mbuttongrouplayoutpolicy_p.cpp \
+    ../../src/views/mdialogview.cpp \
+    ../../src/views/mbuttongrouplayoutpolicy_p.cpp \
 
 # unit test and unit
 HEADERS += \
     ut_mpopuplist.h
 
 INCLUDEPATH += \
-    $$MSRCDIR/corelib/widgets \
-    $$MSRCDIR/views/.moc \
-    $$MSRCDIR/views \
+    ../../src/corelib/widgets \
+    ../../src/views/.moc \
+    ../../src/views \
 
 include(../common_bot.pri)
diff --git a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro
index 6d2d9ecd..ecd50937 100644
--- a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro
+++ b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro
@@ -5,12 +5,12 @@ TARGET = ut_mtapandholdrecognizer
 # unit test and unit classes
 SOURCES += \
     ut_mtapandholdrecognizer.cpp \
-    $$MSRCDIR/corelib/events/mtapandholdrecognizer.cpp \
-    $$MSRCDIR/corelib/events/mtapandholdgesture.cpp \
+    ../../src/corelib/events/mtapandholdrecognizer.cpp \
+    ../../src/corelib/events/mtapandholdgesture.cpp \
     
 # unit test and unit classes
 HEADERS += \
     ut_mtapandholdrecognizer.h \
-    $$MSRCDIR/corelib/events/mtapandholdgesture_p.h \
+    ../../src/corelib/events/mtapandholdgesture_p.h \
 
 include(../common_bot.pri)