From 1f6c979713257f9668a322f2e120652f09d3ee16 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 21 Dec 2011 11:05:19 +0200
Subject: Symbian: Fix qscriptextensionplugin autotest

- Linking of static library needed to be explicitly stated in Symbian.
- Plugin deployment was added.
- Had to rename the simpleplugin in Symbian builds as the name
  was too generic and was causing conflict in /sys/bin.

Task-number: ou1cimx1#956851
Reviewed-by: mread
---
 tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro | 1 +
 tests/auto/qscriptextensionplugin/test/test.pro                 | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro
index e184ca4..e1701e3 100644
--- a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro
+++ b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro
@@ -7,4 +7,5 @@ DESTDIR = ../plugins/script
 
 symbian {
     TARGET.EPOCALLOWDLLDATA=1
+    TARGET = qscriptextension_simpleplugin  # Too generic target causes conflict on Symbian
 }
diff --git a/tests/auto/qscriptextensionplugin/test/test.pro b/tests/auto/qscriptextensionplugin/test/test.pro
index 549bac2..223dafa 100644
--- a/tests/auto/qscriptextensionplugin/test/test.pro
+++ b/tests/auto/qscriptextensionplugin/test/test.pro
@@ -3,7 +3,14 @@ load(qttest_p4)
 QT = core script
 SOURCES = ../tst_qscriptextensionplugin.cpp
 CONFIG -= app_bundle
-LIBS += -L../plugins/script -lstaticplugin
+symbian {
+    LIBS += -lstaticplugin.lib
+    simplePlugin.files = qscriptextension_simpleplugin.dll
+    simplePlugin.path = plugins/script
+    DEPLOYMENT += simplePlugin
+} else {
+    LIBS += -L../plugins/script -lstaticplugin
+}
 
 TARGET = tst_qscriptextensionplugin
 CONFIG(debug_and_release) {
-- 
cgit v0.12