diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-21 09:20:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-21 09:20:31 (GMT) |
| commit | cdbd61f5d8d0e785562c77a8321d41c1846801e3 (patch) | |
| tree | 0a9deb032b6783021c60e7fe2c50c2d9ad8d928b | |
| parent | b4c12d184aa673003bdcd1a9ccd0a863774bc1c9 (diff) | |
| parent | 1f6c979713257f9668a322f2e120652f09d3ee16 (diff) | |
| download | Qt-cdbd61f5d8d0e785562c77a8321d41c1846801e3.zip Qt-cdbd61f5d8d0e785562c77a8321d41c1846801e3.tar.gz Qt-cdbd61f5d8d0e785562c77a8321d41c1846801e3.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian: Fix qscriptextensionplugin autotest
| -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) { |