diff options
| author | bigbearzhu <jun.5.zhu@nokia.com> | 2012-06-26 15:26:28 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 08:12:01 +0200 |
| commit | 9de7ba79ed52c5395f0e455592ef580be26d640f (patch) | |
| tree | b50e7986f38df784246bbb3affc08b86343bc8ef /tests | |
| parent | 23a81d62e78b1bf4156577a6b16a078034403303 (diff) | |
Fixed plugin dir error on Windows.
Change-Id: I470877d988fb70915607b65c4f17eee1adb8049d
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests')
5 files changed, 30 insertions, 2 deletions
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro index afb015874..d8bee7547 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -7,6 +7,13 @@ CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice DESTDIR = ../$${PLUGIN_TYPE} +win32 { + CONFIG(debug, debug|release) { + DESTDIR = ../debug/$${PLUGIN_TYPE} + } else { + DESTDIR = ../release/$${PLUGIN_TYPE} + } +} load(qt_plugin) diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro index 356df79ff..8e39b5b0c 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -7,6 +7,13 @@ CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice DESTDIR = ../$${PLUGIN_TYPE} +win32 { + CONFIG(debug, debug|release) { + DESTDIR = ../debug/$${PLUGIN_TYPE} + } else { + DESTDIR = ../release/$${PLUGIN_TYPE} + } +} load(qt_plugin) diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro index aadb419cc..fe26a0893 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -7,6 +7,13 @@ CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice DESTDIR = ../$${PLUGIN_TYPE} +win32 { + CONFIG(debug, debug|release) { + DESTDIR = ../debug/$${PLUGIN_TYPE} + } else { + DESTDIR = ../release/$${PLUGIN_TYPE} + } +} load(qt_plugin) diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro index d21ccc77d..37260d497 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -7,6 +7,13 @@ CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice DESTDIR = ../$${PLUGIN_TYPE} +win32 { + CONFIG(debug, debug|release) { + DESTDIR = ../debug/$${PLUGIN_TYPE} + } else { + DESTDIR = ../release/$${PLUGIN_TYPE} + } +} load(qt_plugin) diff --git a/tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro index b07c29a69..dbe878f39 100644 --- a/tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro +++ b/tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro @@ -2,11 +2,11 @@ TEMPLATE = subdirs CONFIG += ORDERED SUBDIRS += \ - test \ mockserviceplugin1 \ mockserviceplugin2 \ mockserviceplugin3 \ - mockserviceplugin4 + mockserviceplugin4 \ + test # no special install rule for subdir INSTALLS = |