slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adjust to qt_plugin.prf changes

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen
2012-10-24 15:33:02 +02:00
committed by The Qt Project
parent 9dbcbc0b2f
commit 0affd9023f
18 changed files with 28 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
View File

@@ -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

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
View File

@@ -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

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
View File

@@ -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

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
View File

@@ -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