diff options
37 files changed, 102 insertions, 95 deletions
diff --git a/benchmarks/common_top.pri b/benchmarks/common_top.pri index c9821989..1ead9fb9 100644 --- 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 index b06d7d45..d41a3026 100644 --- 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 index 56d188af..f73796ec 100644 --- 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 index 9ef38bf1..16b65f29 100644 --- 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 index b7a3b488..d0f945bd 100644 --- 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 index ecdf2918..3af7723a 100644 --- 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 index 11ae8ce4..475fe916 100644 --- 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 index 64762633..aab8e8c7 100644 --- 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 index 8b39bcf4..dff855da 100644 --- 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 index 74e798db..ccf33016 100644 --- 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 index 6d0fc89a..7602bca2 100644 --- 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 index 662d276e..a49dae5b 100644 --- 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 index dc2907ba..b31c74b5 100644 --- 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 index a188f0ab..2912c27b 100644 --- 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 index 4961c0ec..ea2631e3 100644 --- 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 index 802ae318..4d638cd3 100644 --- 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 index 0aa5a51e..ea467435 100644 --- 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 index bf1d777c..22c6b0b8 100644 --- 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 index e25e9858..b6c14226 100644 --- 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 index 49adb4c9..ba8d9cd3 100644 --- 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 index 5dffc804..c7872848 100644 --- 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 index 1e1da6d6..6d3a6f69 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 = ../../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 index 9280a741..419c3605 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 \ - ../../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 index 6812b569..3ca575a4 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 \ - ../../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 index 4a078c18..76d7af4e 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 += ../../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 index f11d2c9f..1234a4a8 100644 --- 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 index ee04b5f8..50ee4982 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 \ - ../../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 index 1f876ac9..5b573d10 100644 --- 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 index 0c5d197b..7c74e720 100644 --- 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 index 6373d41f..054e03cc 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 \ - ../../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 index f838db0c..57974abd 100644 --- 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 index 925f21f2..cac868ca 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 \ - ../../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 diff --git a/tests/ut_mmulticolumnlistview/ut_mmulticolumnlistview.pro b/tests/ut_mmulticolumnlistview/ut_mmulticolumnlistview.pro index e9af2134..9c41c0f0 100644 --- a/tests/ut_mmulticolumnlistview/ut_mmulticolumnlistview.pro +++ b/tests/ut_mmulticolumnlistview/ut_mmulticolumnlistview.pro @@ -2,7 +2,14 @@ include(../common_top.pri) TARGET = ut_mmulticolumnlistview -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 +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 include(../common_bot.pri) diff --git a/tests/ut_mpanrecognizer/ut_mpanrecognizer.pro b/tests/ut_mpanrecognizer/ut_mpanrecognizer.pro index c083b280..e3bec2a3 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 \ - ../../src/corelib/events/mpanrecognizer.cpp \ - ../../src/corelib/events/mpangesture.cpp \ + $$MSRCDIR/corelib/events/mpanrecognizer.cpp \ + $$MSRCDIR/corelib/events/mpangesture.cpp \ # unit test and unit classes HEADERS += \ ut_mpanrecognizer.h \ - ../../src/corelib/events/mpangesture_p.h \ + $$MSRCDIR/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 ddc5ac57..37c6c940 100644 --- a/tests/ut_mphysics2dpanning/ut_mphysics2dpanning.pro +++ b/tests/ut_mphysics2dpanning/ut_mphysics2dpanning.pro @@ -1,13 +1,13 @@ include(../common_top.pri) -INCLUDEPATH += $$MSRCDIR/corelib/.moc +INCLUDEPATH += ../../src/corelib/.moc TARGET = ut_mphysics2dpanning # unit test and unit SOURCES += \ ut_mphysics2dpanning.cpp \ - ../../src/corelib/widgets/mphysics2dpanning.cpp \ + $$MSRCDIR/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 f126120c..eedc6a7c 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 \ - ../../src/views/mdialogview.cpp \ - ../../src/views/mbuttongrouplayoutpolicy_p.cpp \ + $$MSRCDIR/views/mdialogview.cpp \ + $$MSRCDIR/views/mbuttongrouplayoutpolicy_p.cpp \ # unit test and unit HEADERS += \ ut_mpopuplist.h INCLUDEPATH += \ - ../../src/corelib/widgets \ + $$MSRCDIR/corelib/widgets \ ../../src/views/.moc \ - ../../src/views \ + $$MSRCDIR/views \ include(../common_bot.pri) diff --git a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.pro index ecd50937..6d2d9ecd 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 \ - ../../src/corelib/events/mtapandholdrecognizer.cpp \ - ../../src/corelib/events/mtapandholdgesture.cpp \ + $$MSRCDIR/corelib/events/mtapandholdrecognizer.cpp \ + $$MSRCDIR/corelib/events/mtapandholdgesture.cpp \ # unit test and unit classes HEADERS += \ ut_mtapandholdrecognizer.h \ - ../../src/corelib/events/mtapandholdgesture_p.h \ + $$MSRCDIR/corelib/events/mtapandholdgesture_p.h \ include(../common_bot.pri) |