diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-12-21 09:05:19 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-12-21 09:13:32 (GMT) |
commit | 1f6c979713257f9668a322f2e120652f09d3ee16 (patch) | |
tree | 0a9deb032b6783021c60e7fe2c50c2d9ad8d928b | |
parent | 914679fcdfa1400dd68c98a247378860b8bcb1bb (diff) | |
download | Qt-1f6c979713257f9668a322f2e120652f09d3ee16.zip Qt-1f6c979713257f9668a322f2e120652f09d3ee16.tar.gz Qt-1f6c979713257f9668a322f2e120652f09d3ee16.tar.bz2 |
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
-rw-r--r-- | tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro | 1 | ||||
-rw-r--r-- | tests/auto/qscriptextensionplugin/test/test.pro | 9 |
2 files changed, 9 insertions, 1 deletions
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) { |