diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-05-26 08:50:47 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-05-26 08:50:47 (GMT) |
| commit | b0b4e58ed417d4fab5f73c0e6f82a2fb6a68f59f (patch) | |
| tree | 9d262ed95f882970054576f255006fdb43b6d549 | |
| parent | ff0418c46ffe5270365b6d53298e3ea9014d14ac (diff) | |
| parent | a83bc9473e340cce2ff84c614a1d6b42ced9dfa2 (diff) | |
| download | Qt-b0b4e58ed417d4fab5f73c0e6f82a2fb6a68f59f.zip Qt-b0b4e58ed417d4fab5f73c0e6f82a2fb6a68f59f.tar.gz Qt-b0b4e58ed417d4fab5f73c0e6f82a2fb6a68f59f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | tests/auto/qlibrary/lib2/lib2.pro | 7 | ||||
| -rw-r--r-- | tests/auto/qlibrary/qlibrary.pro | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/tests/auto/qlibrary/lib2/lib2.pro b/tests/auto/qlibrary/lib2/lib2.pro index 724077a..436d7ba 100644 --- a/tests/auto/qlibrary/lib2/lib2.pro +++ b/tests/auto/qlibrary/lib2/lib2.pro @@ -27,10 +27,11 @@ unix:!symbian: { symbian-abld: { TARGET.CAPABILITY=ALL -TCB + FIXEDROOT = $$replace(EPOCROOT,/,\\) QMAKE_POST_LINK = \ - copy /Y $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dl2 && \ - copy /Y $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\system.trolltech.test.mylib.dll && \ - IF NOT "$(PLATFORM)==WINSCW" copy /Y $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll ..\tst\mylib.dl2 + copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dl2 && \ + copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\system.trolltech.test.mylib.dll && \ + IF NOT "$(PLATFORM)==WINSCW" copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll ..\tst\mylib.dl2 } symbian-sbsv2: { diff --git a/tests/auto/qlibrary/qlibrary.pro b/tests/auto/qlibrary/qlibrary.pro index 9ba49ee..fd5790b 100644 --- a/tests/auto/qlibrary/qlibrary.pro +++ b/tests/auto/qlibrary/qlibrary.pro @@ -1,9 +1,16 @@ QT -= gui TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = lib \ - lib2 \ - tst + +symbian: { +# Can't build two versions of lib with same name in symbian, so just build one +SUBDIRS = lib2 \ + tst +} else { +SUBDIRS = lib \ + lib2 \ + tst +} TARGET = tst_qlibrary # no special install rule for subdir |