diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-24 15:33:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-05 14:01:31 +0100 |
| commit | 0affd9023ff1146c822cd188612c7727947ea618 (patch) | |
| tree | 3e1f3efed0801fe275beff7511f45b9d856e9df5 /tests | |
| parent | 9dbcbc0b2f4a932a1f68572135de44124bab064c (diff) | |
adjust to qt_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now. note that in
the qmediaserviceprovider test we must override that.
also, TARGET munging is done automatically.
Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
4 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro index df237a141..ad311169e 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -3,6 +3,8 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +load(qt_plugin) + DESTDIR = ../$${PLUGIN_TYPE} win32 { CONFIG(debug, debug|release) { @@ -12,12 +14,10 @@ win32 { } } -load(qt_plugin) - HEADERS += ../mockservice.h SOURCES += mockserviceplugin1.cpp OTHER_FILES += mockserviceplugin1.json -target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} -INSTALLS += target +target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro index 0403f5795..6b30d7772 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -3,6 +3,8 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +load(qt_plugin) + DESTDIR = ../$${PLUGIN_TYPE} win32 { CONFIG(debug, debug|release) { @@ -12,12 +14,10 @@ win32 { } } -load(qt_plugin) - HEADERS += ../mockservice.h SOURCES += mockserviceplugin2.cpp OTHER_FILES += mockserviceplugin2.json -target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} -INSTALLS += target +target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro index 51744d35a..bae1af983 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -3,6 +3,8 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +load(qt_plugin) + DESTDIR = ../$${PLUGIN_TYPE} win32 { CONFIG(debug, debug|release) { @@ -12,12 +14,10 @@ win32 { } } -load(qt_plugin) - HEADERS += ../mockservice.h SOURCES += mockserviceplugin3.cpp OTHER_FILES += mockserviceplugin3.json -target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} -INSTALLS += target +target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro index f5583884d..ccd8b0eda 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -3,6 +3,8 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +load(qt_plugin) + DESTDIR = ../$${PLUGIN_TYPE} win32 { CONFIG(debug, debug|release) { @@ -12,12 +14,10 @@ win32 { } } -load(qt_plugin) - HEADERS += ../mockservice.h SOURCES += mockserviceplugin4.cpp OTHER_FILES += mockserviceplugin4.json -target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} -INSTALLS += target +target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |