Commit 460a74d2 authored by Miroslav Safr's avatar Miroslav Safr

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
parent 637b4707
# for defines
include(../mkspecs/common.pri)
MSRCDIR = ../../src/
MSRCDIR = $${M_SOURCE_TREE}/src
STUBSDIR = ../stubs
INCLUDEPATH += \
. \
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = mt_mbutton
SOURCES += mt_mbutton.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = mt_mbuttongroup
SOURCES += mt_mbuttongroup.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = mt_mdialog
SOURCES += mt_mdialog.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = mt_mimagewidget
SOURCES += mt_mimagewidget.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = mt_mlabel
SOURCES += mt_mlabel.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = mt_mlist
SOURCES += mt_mlist.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = mt_mmenu
SOURCES += mt_mmenu.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = mt_mprogressindicator
SOURCES += mt_mprogressindicator.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = mt_mtoolbar
SOURCES += mt_mtoolbar.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include ../../src/corelib/theme
INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/corelib/theme
DEPENDPATH += $$INCLUDEPATH
TARGET = pt_mbutton
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$INCLUDEPATH
TARGET = pt_mcomponentdata
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = pt_micontestcase
SOURCES += pt_micontestcase.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$INCLUDEPATH
TARGET = pt_mimagewidget
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = pt_mlabel
SOURCES += pt_mlabel.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include ../../src/theme
INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/theme
DEPENDPATH += $$INCLUDEPATH
TARGET = pt_mmenu
......
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
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include ../../src/theme ../../src/painting
INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/theme $$MSRCDIR/painting
DEPENDPATH += $$INCLUDEPATH
TARGET = pt_mscalableimage
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
DEPENDPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$MSRCDIR/include
TARGET = pt_mslider
SOURCES += pt_mslider.cpp
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include
INCLUDEPATH += $$MSRCDIR/include
DEPENDPATH += $$INCLUDEPATH
TARGET = pt_mtheme
......
include(../common_top.pri)
INCLUDEPATH += ../../src/include ../../src/theme
INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/theme
DEPENDPATH += $$INCLUDEPATH
TARGET = pt_mtoolbar
......
......@@ -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 += \
. \
......
......@@ -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 += \
......
......@@ -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 \
......
......@@ -2,7 +2,7 @@ include(../common_top.pri)
TARGET = ut_mabstractitemmodel
INCLUDEPATH += ../../src/corelib/widgets \
INCLUDEPATH += $$MSRCDIR/corelib/widgets \
HEADERS += ut_mabstractitemmodel.h \
......
......@@ -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
......
......@@ -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)
......@@ -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 \
......
......@@ -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 \
......
......@@ -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)
......@@ -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 \
......
......@@ -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
......
......@@ -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)
......@@ -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)
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 += \
......
......@@ -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)
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment