diff options
| author | Pasi Pentikainen <ext-pasi.a.pentikainen@nokia.com> | 2012-01-30 15:51:20 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 18:19:09 (GMT) |
| commit | 4c4466d84cee48624e1016e588d3eaada57c9541 (patch) | |
| tree | 54a5e545204aebf8d3deeb48134aabbce15ce4dc /mkspecs | |
| parent | 5a6737b70f53c8289c85a53877ac3e0a3bf22d19 (diff) | |
| download | Qt-4c4466d84cee48624e1016e588d3eaada57c9541.zip Qt-4c4466d84cee48624e1016e588d3eaada57c9541.tar.gz Qt-4c4466d84cee48624e1016e588d3eaada57c9541.tar.bz2 | |
Symbian: clean deffiles for external projects using Qt infix
When external projects use the infix configuration of Qt (QT_LIBINFIX),
they can make their own library targets infixed. This fix cleans the
infix from deffile names for such projects also, as long as the project
defines variable QT_LIBINFIX_USED.
Change-Id: Ifaf773c60d1ebe6f947f1cd44b76428de1c23dbf
Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/def_files.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf index a78c74e..f0bb284 100644 --- a/mkspecs/features/symbian/def_files.prf +++ b/mkspecs/features/symbian/def_files.prf @@ -4,7 +4,8 @@ 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)|equals(QMAKE_TARGET_PRODUCT, QTestLib):clean_TARGET = $$replace(TARGET, "$${QT_LIBINFIX}$", "") +# If a non-Qt project uses QT_LIBINFIX, it may declare QT_LIBINFIX_USED +equals(QMAKE_TARGET_PRODUCT, Qt4)|equals(QMAKE_TARGET_PRODUCT, QTestLib)|!isEmpty(QT_LIBINFIX_USED):clean_TARGET = $$replace(TARGET, "$${QT_LIBINFIX}$", "") else:clean_TARGET = $$TARGET defineTest(qtTestIfDirExists) { |