diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 16:04:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 16:04:57 (GMT) |
| commit | 3a6bbedcea2b5ef15077a67c58e9e59abe904014 (patch) | |
| tree | c2199f9faa005e5082e9fe419fea3b4e85e4c6e7 /mkspecs/features | |
| parent | 84b5bbc77045cdc267626ff86f309664283abed4 (diff) | |
| parent | 8aa9c7638080e56b124f6542699c45dfbcbba2c0 (diff) | |
| download | Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.zip Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.gz Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/static_and_shared.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/def_files.prf | 2 |
2 files changed, 2 insertions, 2 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) } diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf index 1c11925..746de6a 100644 --- a/mkspecs/features/symbian/def_files.prf +++ b/mkspecs/features/symbian/def_files.prf @@ -4,7 +4,7 @@ CONFIG -= def_files_disabled # We need a target name without the INFIX'ed part, since DEF files are not infixed. -equals(QMAKE_TARGET_PRODUCT, Qt4):clean_TARGET = $$replace(TARGET, "$${QT_LIBINFIX}$", "") +equals(QMAKE_TARGET_PRODUCT, Qt4)|equals(QMAKE_TARGET_PRODUCT, QTestLib):clean_TARGET = $$replace(TARGET, "$${QT_LIBINFIX}$", "") else:clean_TARGET = $$TARGET defineTest(qtTestIfDirExists) { |