diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-23 12:35:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-23 12:35:17 (GMT) |
| commit | e1af4576320a5d29aac9016ccc54432fbf13b9be (patch) | |
| tree | fa24c691d7001dd7cbc37decde182fe08964b683 /tests/auto/qscriptextensionplugin | |
| parent | 26d5ca5f3b33e7b0f38426034c99bc17557e5414 (diff) | |
| parent | 1ac559f5ea335de5d78bef8d991133b95081a1b7 (diff) | |
| download | Qt-e1af4576320a5d29aac9016ccc54432fbf13b9be.zip Qt-e1af4576320a5d29aac9016ccc54432fbf13b9be.tar.gz Qt-e1af4576320a5d29aac9016ccc54432fbf13b9be.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Revert variable overwritten by copying from Qt5
New style sheet for offline (QCH) documentation
New style sheet for offline (QCH) documentation
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
qnetworkproxy_mac.cpp was not compiled in on Mac for the network module
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 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) { |