Changes: Tests: relative paths to ../../src in .pro files changed to …

…$$MSRCDIR RevBy: Details: We use rather $$MSRCDIR for src directory. It allows us to compile and use tests in libmeegotouch/build-i386/tests and in libmeegotouch/tests generated files have to accessed byt relative path, not by $$MSRCDIR
sailfishos · Jul 16, 2010 · 460a74d · 460a74d
1 parent 637b470
commit 460a74d
Show file tree

Hide file tree

Showing 37 changed files with 102 additions and 95 deletions.
diff --git a/benchmarks/common_top.pri b/benchmarks/common_top.pri
@@ -1,7 +1,7 @@
 # for defines
 include(../mkspecs/common.pri)
 
-MSRCDIR = ../../src/
+MSRCDIR = $${M_SOURCE_TREE}/src
 STUBSDIR = ../stubs
 INCLUDEPATH += \
     . \

diff --git a/benchmarks/mt_mbutton/mt_mbutton.pro b/benchmarks/mt_mbutton/mt_mbutton.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = mt_mbutton
 
 SOURCES += mt_mbutton.cpp

diff --git a/benchmarks/mt_mbuttongroup/mt_mbuttongroup.pro b/benchmarks/mt_mbuttongroup/mt_mbuttongroup.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = mt_mbuttongroup
 
 SOURCES += mt_mbuttongroup.cpp

diff --git a/benchmarks/mt_mdialog/mt_mdialog.pro b/benchmarks/mt_mdialog/mt_mdialog.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = mt_mdialog
 
 SOURCES += mt_mdialog.cpp

diff --git a/benchmarks/mt_mimagewidget/mt_mimagewidget.pro b/benchmarks/mt_mimagewidget/mt_mimagewidget.pro
@@ -1,7 +1,7 @@
 
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = mt_mimagewidget
 
 SOURCES += mt_mimagewidget.cpp

diff --git a/benchmarks/mt_mlabel/mt_mlabel.pro b/benchmarks/mt_mlabel/mt_mlabel.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = mt_mlabel
 
 SOURCES += mt_mlabel.cpp

diff --git a/benchmarks/mt_mlist/mt_mlist.pro b/benchmarks/mt_mlist/mt_mlist.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = mt_mlist
 
 SOURCES += mt_mlist.cpp

diff --git a/benchmarks/mt_mmenu/mt_mmenu.pro b/benchmarks/mt_mmenu/mt_mmenu.pro
@@ -1,7 +1,7 @@
 
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = mt_mmenu
 
 SOURCES += mt_mmenu.cpp

diff --git a/benchmarks/mt_mprogressindicator/mt_mprogressindicator.pro b/benchmarks/mt_mprogressindicator/mt_mprogressindicator.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = mt_mprogressindicator
 
 SOURCES += mt_mprogressindicator.cpp

diff --git a/benchmarks/mt_mtoolbar/mt_mtoolbar.pro b/benchmarks/mt_mtoolbar/mt_mtoolbar.pro
@@ -1,7 +1,7 @@
 
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = mt_mtoolbar
 
 SOURCES += mt_mtoolbar.cpp

diff --git a/benchmarks/pt_mbutton/pt_mbutton.pro b/benchmarks/pt_mbutton/pt_mbutton.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include ../../src/corelib/theme
+INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/corelib/theme
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mbutton
 

diff --git a/benchmarks/pt_mcomponentdata/pt_mcomponentdata.pro b/benchmarks/pt_mcomponentdata/pt_mcomponentdata.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mcomponentdata
 

diff --git a/benchmarks/pt_micontestcase/pt_micontestcase.pro b/benchmarks/pt_micontestcase/pt_micontestcase.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = pt_micontestcase
 
 SOURCES += pt_micontestcase.cpp

diff --git a/benchmarks/pt_mimagewidget/pt_mimagewidget.pro b/benchmarks/pt_mimagewidget/pt_mimagewidget.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mimagewidget
 

diff --git a/benchmarks/pt_mlabel/pt_mlabel.pro b/benchmarks/pt_mlabel/pt_mlabel.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = pt_mlabel
 
 SOURCES += pt_mlabel.cpp

diff --git a/benchmarks/pt_mmenu/pt_mmenu.pro b/benchmarks/pt_mmenu/pt_mmenu.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include ../../src/theme
+INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/theme
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mmenu
 

diff --git a/benchmarks/pt_mprogressindicator/pt_mprogressindicator.pro b/benchmarks/pt_mprogressindicator/pt_mprogressindicator.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include ../../src/widgets/views
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/widgets/views
+DEPENDPATH += $$MSRCDIR/include
 TARGET = pt_mprogressindicator
 
 SOURCES += pt_mprogressindicator.cpp

diff --git a/benchmarks/pt_mscalableimage/pt_mscalableimage.pro b/benchmarks/pt_mscalableimage/pt_mscalableimage.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include ../../src/theme ../../src/painting
+INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/theme $$MSRCDIR/painting
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mscalableimage
 

diff --git a/benchmarks/pt_mslider/pt_mslider.pro b/benchmarks/pt_mslider/pt_mslider.pro
@@ -1,6 +1,6 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
-DEPENDPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
+DEPENDPATH += $$MSRCDIR/include
 TARGET = pt_mslider
 
 SOURCES += pt_mslider.cpp

diff --git a/benchmarks/pt_mtheme/pt_mtheme.pro b/benchmarks/pt_mtheme/pt_mtheme.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include
+INCLUDEPATH += $$MSRCDIR/include
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mtheme
 

diff --git a/benchmarks/pt_mtoolbar/pt_mtoolbar.pro b/benchmarks/pt_mtoolbar/pt_mtoolbar.pro
@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include ../../src/theme
+INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/theme
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_mtoolbar
 

diff --git 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 = ../../src
+MSRCDIR = $${M_SOURCE_TREE}/src
 STUBSDIR = ../stubs
 INCLUDEPATH += \
     . \

diff --git 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 \
-    ../../src/corelib/theme/mlogicalvalues.cpp \
-    ../../src/corelib/style/mstylesheetattribute.cpp
+    $$MSRCDIR/corelib/theme/mlogicalvalues.cpp \
+    $$MSRCDIR/corelib/style/mstylesheetattribute.cpp
 
 HEADERS += \
 	ft_mstylesheet.h \
@@ -18,8 +18,8 @@ HEADERS += \
     testwidget.h \
     testwidget2.h \
     testwidget3.h \
-    ../../src/corelib/theme/mlogicalvalues.h \
-    ../../src/corelib/style/mstylesheetattribute.h \
+    $$MSRCDIR/corelib/theme/mlogicalvalues.h \
+    $$MSRCDIR/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
@@ -5,14 +5,14 @@ LIBRARYPATH += $$MSRCDIR
 
 SOURCES += \
 	ft_mstylesheetparser.cpp \
-    ../../src/corelib/theme/mlogicalvalues.cpp \
-    ../../src/corelib/style/mstylesheetattribute.cpp
+    $$MSRCDIR/corelib/theme/mlogicalvalues.cpp \
+    $$MSRCDIR/corelib/style/mstylesheetattribute.cpp
 
 
 HEADERS += \
 	ft_mstylesheetparser.h \
-	../../src/corelib/theme/mlogicalvalues.h \
-	../../src/corelib/style/mstylesheetattribute.h
+        $$MSRCDIR/corelib/theme/mlogicalvalues.h \
+        $$MSRCDIR/corelib/style/mstylesheetattribute.h
 
 support_files.files += \
         *.css \

diff --git 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 += ../../src/corelib/widgets \
+INCLUDEPATH += $$MSRCDIR/corelib/widgets \
 
 HEADERS += ut_mabstractitemmodel.h \
 

diff --git a/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.pro b/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.pro
@@ -4,7 +4,7 @@ include(../common_mextensions.pri)
 INCLUDEPATH += \
     $$MSRCDIR/events \
     $$MSRCDIR/extensions \
-    $$MSRCDIR/corelib/.gen
+    ../../src/corelib/.gen
 
 QT += core network gui svg dbus
 

diff --git 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 \
-    ../../src/views/mcomboboxview.cpp \
-    ../../src/views/widgets/mcomboboxbutton.cpp \
+    $$MSRCDIR/views/mcomboboxview.cpp \
+    $$MSRCDIR/views/widgets/mcomboboxbutton.cpp \
 
 # unit test and unit
 HEADERS += \
     ut_mcombobox.h
 
 INCLUDEPATH += \
-    ../../src/corelib/widgets \
-    ../../src/views \
-    ../../src/views/widgets \
+    $$MSRCDIR/corelib/widgets \
+    $$MSRCDIR/views \
+    $$MSRCDIR/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
@@ -3,24 +3,24 @@ include(../common_top.pri)
 TARGET = ut_mlistviewgroupheader
 
 INCLUDEPATH += ../mlistviewcommon \
-        ../../src/corelib/widgets \
-        ../../src/views/widgets \
-        ../../src/views \
+        $$MSRCDIR/corelib/widgets \
+        $$MSRCDIR/views/widgets \
+        $$MSRCDIR/views \
         ../../src/corelib/.gen
 
 HEADERS += ut_mlistviewgroupheader.h \
         ../mlistviewcommon/myindexedmodel.h \
-        ../../src/views/widgets/mlistindexmodel.h \
-        ../../src/views/style/mlistindexstyle.h \
+        $$MSRCDIR/views/widgets/mlistindexmodel.h \
+        $$MSRCDIR/views/style/mlistindexstyle.h \
 
 SOURCES += ut_mlistviewgroupheader.cpp  \
         ../mlistviewcommon/myindexedmodel.cpp \
-        ../../src/views/mlistview_p.cpp \
+        $$MSRCDIR/views/mlistview_p.cpp \
         ../../src/views/.moc/moc_mlistview_p.cpp \
-        ../../src/views/widgets/mlistindex.cpp \
+        $$MSRCDIR/views/widgets/mlistindex.cpp \
         ../../src/views/.moc/moc_mlistindex.cpp \
         ../../src/views/.gen/gen_mlistindexmodeldata.cpp \
-        ../../src/views/mlistindexview.cpp \
+        $$MSRCDIR/views/mlistindexview.cpp \
         ../../src/views/.moc/moc_mlistindexview.cpp \
         ../../src/views/.moc/moc_mlistindexview_p.cpp \
         ../../src/views/.gen/gen_mlistindexstyledata.cpp \

diff --git a/tests/ut_mlistviewmulticolumn/ut_mlistviewmulticolumn.pro b/tests/ut_mlistviewmulticolumn/ut_mlistviewmulticolumn.pro
@@ -3,24 +3,24 @@ include(../common_top.pri)
 TARGET = ut_mlistviewmulticolumn
 
 INCLUDEPATH += ../mlistviewcommon \
-        ../../src/corelib/widgets \
-        ../../src/views/widgets \
-        ../../src/views \
+        $$MSRCDIR/corelib/widgets \
+        $$MSRCDIR/views/widgets \
+        $$MSRCDIR/views \
         ../../src/corelib/.gen
 
 HEADERS += ut_mlistviewmulticolumn.h \
         ../mlistviewcommon/myindexedmodel.h \
-        ../../src/views/widgets/mlistindexmodel.h \
-        ../../src/views/style/mlistindexstyle.h \
+        $$MSRCDIR/views/widgets/mlistindexmodel.h \
+        $$MSRCDIR/views/style/mlistindexstyle.h \
 
 SOURCES += ut_mlistviewmulticolumn.cpp  \
         ../mlistviewcommon/myindexedmodel.cpp \
-        ../../src/views/mlistview_p.cpp \
+        $$MSRCDIR/views/mlistview_p.cpp \
         ../../src/views/.moc/moc_mlistview_p.cpp \
-        ../../src/views/widgets/mlistindex.cpp \
+        $$MSRCDIR/views/widgets/mlistindex.cpp \
         ../../src/views/.moc/moc_mlistindex.cpp \
         ../../src/views/.gen/gen_mlistindexmodeldata.cpp \
-        ../../src/views/mlistindexview.cpp \
+        $$MSRCDIR/views/mlistindexview.cpp \
         ../../src/views/.moc/moc_mlistindexview.cpp \
         ../../src/views/.moc/moc_mlistindexview_p.cpp \
         ../../src/views/.gen/gen_mlistindexstyledata.cpp \

diff --git 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  \
-        ../../src/corelib/widgets/views/mlistview_p.cpp \
-        ../../src/corelib/widgets/mcell.cpp \
+        $$MSRCDIR/corelib/widgets/views/mlistview_p.cpp \
+        $$MSRCDIR/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
@@ -3,24 +3,24 @@ include(../common_top.pri)
 TARGET = ut_mlistviewseparators
 
 INCLUDEPATH += ../mlistviewcommon \
-        ../../src/corelib/widgets \
-        ../../src/views/widgets \
-        ../../src/views \
+        $$MSRCDIR/corelib/widgets \
+        $$MSRCDIR/views/widgets \
+        $$MSRCDIR/views \
         ../../src/corelib/.gen
 
 HEADERS += ut_mlistviewseparators.h \
         ../mlistviewcommon/myindexedmodel.h \
-        ../../src/views/widgets/mlistindexmodel.h \
-        ../../src/views/style/mlistindexstyle.h \
+        $$MSRCDIR/views/widgets/mlistindexmodel.h \
+        $$MSRCDIR/views/style/mlistindexstyle.h \
 
 SOURCES += ut_mlistviewseparators.cpp  \
         ../mlistviewcommon/myindexedmodel.cpp \
-        ../../src/views/mlistview_p.cpp \
+        $$MSRCDIR/views/mlistview_p.cpp \
         ../../src/views/.moc/moc_mlistview_p.cpp \
-        ../../src/views/widgets/mlistindex.cpp \
+        $$MSRCDIR/views/widgets/mlistindex.cpp \
         ../../src/views/.moc/moc_mlistindex.cpp \
         ../../src/views/.gen/gen_mlistindexmodeldata.cpp \
-        ../../src/views/mlistindexview.cpp \
+        $$MSRCDIR/views/mlistindexview.cpp \
         ../../src/views/.moc/moc_mlistindexview.cpp \
         ../../src/views/.moc/moc_mlistindexview_p.cpp \
         ../../src/views/.gen/gen_mlistindexstyledata.cpp \

diff --git a/tests/ut_mlogicalvalues/ut_mlogicalvalues.pro b/tests/ut_mlogicalvalues/ut_mlogicalvalues.pro
@@ -5,14 +5,14 @@ LIBRARYPATH += $$MSRCDIR
 
 SOURCES += \
 	ut_mlogicalvalues.cpp \
-    ../../src/corelib/theme/mlogicalvalues.cpp \
-    ../../src/corelib/style/mstylesheetattribute.cpp
+    $$MSRCDIR/corelib/theme/mlogicalvalues.cpp \
+    $$MSRCDIR/corelib/style/mstylesheetattribute.cpp
 
 HEADERS += \
 	ut_mlogicalvalues.h \
-	../../src/corelib/theme/mlogicalvalues.h \
-	../../src/corelib/theme/mlogicalvalues_p.h \
-	../../src/corelib/style/mstylesheetattribute.h
+        $$MSRCDIR/corelib/theme/mlogicalvalues.h \
+        $$MSRCDIR/corelib/theme/mlogicalvalues_p.h \
+        $$MSRCDIR/corelib/style/mstylesheetattribute.h
 
 support_files.files += *.ini