From 9de7ba79ed52c5395f0e455592ef580be26d640f Mon Sep 17 00:00:00 2001
From: bigbearzhu <jun.5.zhu@nokia.com>
Date: Tue, 26 Jun 2012 15:26:28 +1000
Subject: [PATCH] Fixed plugin dir error on Windows.

Change-Id: I470877d988fb70915607b65c4f17eee1adb8049d
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
---
 .../mockserviceplugin1/mockserviceplugin1.pro              | 7 +++++++
 .../mockserviceplugin2/mockserviceplugin2.pro              | 7 +++++++
 .../mockserviceplugin3/mockserviceplugin3.pro              | 7 +++++++
 .../mockserviceplugin4/mockserviceplugin4.pro              | 7 +++++++
 .../unit/qmediaserviceprovider/qmediaserviceprovider.pro   | 4 ++--
 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 afb01587..d8bee754 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 356df79f..8e39b5b0 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 aadb419c..fe26a089 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 d21ccc77..37260d49 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 b07c29a6..dbe878f3 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 =