diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-04 03:33:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-04 03:33:40 (GMT) |
| commit | 4fa6a636c13ee9dd57edbbc3bfd03674408723bf (patch) | |
| tree | f25a7889ee3a6fd6675738c5745a2081d255cf4c | |
| parent | 44109ecd14a707a78140a06e1452d30d52be33af (diff) | |
| parent | 1f24941131a7ab62969265f1e29ef990dbc60ff5 (diff) | |
| download | Qt-4fa6a636c13ee9dd57edbbc3bfd03674408723bf.zip Qt-4fa6a636c13ee9dd57edbbc3bfd03674408723bf.tar.gz Qt-4fa6a636c13ee9dd57edbbc3bfd03674408723bf.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:
Ignore static_and_shared in Symbian builds.
| -rw-r--r-- | mkspecs/features/static_and_shared.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/static_and_shared.prf b/mkspecs/features/static_and_shared.prf index f586bdd..39a9a1f 100644 --- a/mkspecs/features/static_and_shared.prf +++ b/mkspecs/features/static_and_shared.prf @@ -1,3 +1,3 @@ -!contains(TEMPLATE, subdirs):!macx-xcode { +!contains(TEMPLATE, subdirs):!macx-xcode:!symbian-abld:!symbian-sbsv2 { addExclusiveBuilds(static, Static, shared, Shared) } |