diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-29 07:47:09 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-29 07:47:09 (GMT) |
commit | 484b204e76607723a88a15de545db1646cdec023 (patch) | |
tree | 9fa3cae23d4afecc58a13d7557d8d2603a1d7595 /tests/auto/qlibrary/qlibrary.pro | |
parent | 777c504bb7858bf5e7073f7efbe58db33b93673a (diff) | |
parent | dcf5d568aba893d690eedbe1e18148b504de2abb (diff) | |
download | Qt-484b204e76607723a88a15de545db1646cdec023.zip Qt-484b204e76607723a88a15de545db1646cdec023.tar.gz Qt-484b204e76607723a88a15de545db1646cdec023.tar.bz2 |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/qlibrary/qlibrary.pro')
-rw-r--r-- | tests/auto/qlibrary/qlibrary.pro | 13 |
1 files changed, 10 insertions, 3 deletions
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 |