summaryrefslogtreecommitdiffstats
path: root/tests/auto/qpluginloader/tst/tst.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-10 04:22:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-10 04:22:03 (GMT)
commit4b029b2882d9dd59893807b2db72efc43792aafd (patch)
tree06d7cf3c4fb55c37c3684eaccfdd930d5ed73239 /tests/auto/qpluginloader/tst/tst.pro
parent8d312c3c91931d60ef3d4585cb729db21f3489c2 (diff)
parentd3ab1fccea2b1e011e7518269a29045a53f0a30b (diff)
downloadQt-4b029b2882d9dd59893807b2db72efc43792aafd.zip
Qt-4b029b2882d9dd59893807b2db72efc43792aafd.tar.gz
Qt-4b029b2882d9dd59893807b2db72efc43792aafd.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pending surface might not get destroyed if no flush() happens Rename Symbian generated mmp/mk files to include target in filename Use ARGB32 premultiplied backing store format in Symbian^3 Register window types for Symbian system effects Added $$MW_LAYER_SYSTEMINCLUDE to some autotests Fix duplicate binary names issues in Symbian autotests Fix some autotest deployments to work in case Qt is already deployed Fix run and runonphone targets for projects that have TARGET with path
Diffstat (limited to 'tests/auto/qpluginloader/tst/tst.pro')
-rw-r--r--tests/auto/qpluginloader/tst/tst.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/qpluginloader/tst/tst.pro
index 2de0912..2d757e7 100644
--- a/tests/auto/qpluginloader/tst/tst.pro
+++ b/tests/auto/qpluginloader/tst/tst.pro
@@ -20,7 +20,7 @@ wince*: {
}
symbian: {
- libDep.sources = mylib.dll
+ libDep.sources = tst_qpluginloaderlib.dll
libDep.path = /sys/bin
pluginDep.sources = theplugin.dll
pluginDep.path = bin