diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-22 23:33:44 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-22 23:33:44 +1000 |
| commit | 740435592317e1f242ccacf40b8e66a04069013a (patch) | |
| tree | 637ea1555f4acc004422e2796f6f8155fdbfe67b /tests/auto/qscriptextensionplugin | |
| parent | be9b7f24a3d5d7e85188390e02fa908d2839c704 (diff) | |
| parent | c9e41cd9db6ed9b5f8e2b0d168288987fbb79e6e (diff) | |
| download | qt4-tools-740435592317e1f242ccacf40b8e66a04069013a.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian: Fix exporting and importing of some functions for autotests
Symbian: Fix SRCDIR usage in qlayout autotest.
Symbian: Fix qcssparser autotest
Symbian: Fix qscriptextensionplugin autotest
Diffstat (limited to 'tests/auto/qscriptextensionplugin')
| -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 e184ca4ee5..e1701e3f01 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 549bac266c..223dafa356 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) { |