diff options
| author | Holger Schroeder <holger.schroeder.ext@basyskom.de> | 2010-06-11 14:40:37 +0200 |
|---|---|---|
| committer | Daniel d'Andrada <daniel.dandrada@nokia.com> | 2010-06-30 11:21:59 +0300 |
| commit | f11dee17400d9998a2681a94b809d3e5ca17348f (patch) | |
| tree | 8c1bc305d5d4725257fe3caa33a2726d2fbb0458 | |
| parent | 96fd58afba306468002df3e6d5549e929382f845 (diff) | |
Changes: simplify feedback .pro files
RevBy: Max Waterman
Details: these copy-steps are not needed...
| -rw-r--r-- | tests/ut_mfeedback/ut_mfeedback.pro | 37 | ||||
| -rw-r--r-- | tests/ut_mfeedbackplayer/ut_mfeedbackplayer.pro | 37 |
2 files changed, 12 insertions, 62 deletions
diff --git a/tests/ut_mfeedback/ut_mfeedback.pro b/tests/ut_mfeedback/ut_mfeedback.pro index 7861e537..37f723d8 100644 --- a/tests/ut_mfeedback/ut_mfeedback.pro +++ b/tests/ut_mfeedback/ut_mfeedback.pro @@ -1,48 +1,23 @@ include(../common_top.pri) -# FIXME holger check - INCLUDEPATH += $$MSRCDIR/corelib/feedback TARGET = ut_mfeedback -TESTED_SOURCES = $$MSRCDIR/corelib/feedback/mfeedback.cpp \ - $$MSRCDIR/corelib/feedback/mfeedback_p.cpp - -TESTED_HEADERS = $$MSRCDIR/corelib/feedback/mfeedback.h \ - $$MSRCDIR/corelib/feedback/mfeedback_p.h - -copysourcefiles.input = TESTED_SOURCES -copysourcefiles.output = ${QMAKE_FILE_BASE}.cpp -copysourcefiles.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_BASE}.cpp -copysourcefiles.variable_out = SOURCES -copysourcefiles.CONFIG = target_predeps no_link -QMAKE_EXTRA_COMPILERS += copysourcefiles - -copyheaderfiles.input = TESTED_HEADERS -copyheaderfiles.output = ${QMAKE_FILE_BASE}.h -copyheaderfiles.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_BASE}.h -copyheaderfiles.variable_out = HEADERS -copyheaderfiles.CONFIG = target_predeps no_link -QMAKE_EXTRA_COMPILERS += copyheaderfiles - -mocheaderfiles.input = TESTED_HEADERS -mocheaderfiles.output = moc_${QMAKE_FILE_BASE}.cpp -mocheaderfiles.commands = $$QMAKE_MOC $(DEFINES) $(INCPATH) ${QMAKE_FILE_BASE}.h -o moc_${QMAKE_FILE_BASE}.cpp -mocheaderfiles.variable_out = SOURCES -mocheaderfiles.CONFIG = target_predeps no_link -QMAKE_EXTRA_COMPILERS += mocheaderfiles - SOURCES += \ ut_mfeedback.cpp \ mfeedbackplayer_mock.cpp \ - mapplication_mock.cpp + mapplication_mock.cpp \ + $$MSRCDIR/corelib/feedback/mfeedback.cpp \ + $$MSRCDIR/corelib/feedback/mfeedback_p.cpp HEADERS += \ ut_mfeedback.h \ mfeedbackplayer.h \ mfeedbackplayer_mock.h \ mapplication.h \ - mapplication_mock.h + mapplication_mock.h \ + $$MSRCDIR/corelib/feedback/mfeedback.h \ + $$MSRCDIR/corelib/feedback/mfeedback_p.h include(../common_bot.pri) diff --git a/tests/ut_mfeedbackplayer/ut_mfeedbackplayer.pro b/tests/ut_mfeedbackplayer/ut_mfeedbackplayer.pro index 841f6f58..cc68afaa 100644 --- a/tests/ut_mfeedbackplayer/ut_mfeedbackplayer.pro +++ b/tests/ut_mfeedbackplayer/ut_mfeedbackplayer.pro @@ -1,42 +1,15 @@ include(../common_top.pri) -#FIXME holger check - INCLUDEPATH += $$MSRCDIR/corelib/feedback TARGET = ut_mfeedbackplayer -TESTED_SOURCES = $$MSRCDIR/corelib/feedback/mfeedbackplayer.cpp \ - $$MSRCDIR/corelib/feedback/mfeedbackplayer_p.cpp - -TESTED_HEADERS = $$MSRCDIR/corelib/feedback/mfeedbackplayer.h \ - $$MSRCDIR/corelib/feedback/mfeedbackplayer_p.h - -copysourcefiles.input = TESTED_SOURCES -copysourcefiles.output = ${QMAKE_FILE_BASE}.cpp -copysourcefiles.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_BASE}.cpp -copysourcefiles.variable_out = SOURCES -copysourcefiles.CONFIG = target_predeps no_link -QMAKE_EXTRA_COMPILERS += copysourcefiles - -copyheaderfiles.input = TESTED_HEADERS -copyheaderfiles.output = ${QMAKE_FILE_BASE}.h -copyheaderfiles.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_BASE}.h -copyheaderfiles.variable_out = HEADERS -copyheaderfiles.CONFIG = target_predeps no_link -QMAKE_EXTRA_COMPILERS += copyheaderfiles - -mocheaderfiles.input = TESTED_HEADERS -mocheaderfiles.output = moc_${QMAKE_FILE_BASE}.cpp -mocheaderfiles.commands = $$QMAKE_MOC $(DEFINES) $(INCPATH) ${QMAKE_FILE_BASE}.h -o moc_${QMAKE_FILE_BASE}.cpp -mocheaderfiles.variable_out = SOURCES -mocheaderfiles.CONFIG = target_predeps no_link -QMAKE_EXTRA_COMPILERS += mocheaderfiles - SOURCES += \ ut_mfeedbackplayer.cpp \ qlocalsocket_mock.cpp \ - mapplicationprivate_mock.cpp + mapplicationprivate_mock.cpp \ + $$MSRCDIR/corelib/feedback/mfeedbackplayer.cpp \ + $$MSRCDIR/corelib/feedback/mfeedbackplayer_p.cpp HEADERS += \ ut_mfeedbackplayer.h \ @@ -45,6 +18,8 @@ HEADERS += \ qlocalsocket_mock.h \ mapplicationprivate_mock.h \ mexport.h \ - mexport_mock.h + mexport_mock.h \ + $$MSRCDIR/corelib/feedback/mfeedbackplayer.h \ + $$MSRCDIR/corelib/feedback/mfeedbackplayer_p.h include(../common_bot.pri) |