From 4c4466d84cee48624e1016e588d3eaada57c9541 Mon Sep 17 00:00:00 2001 From: Pasi Pentikainen Date: Mon, 30 Jan 2012 17:51:20 +0200 Subject: 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 Reviewed-by: Shane Kearns --- mkspecs/features/symbian/def_files.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) { -- cgit v0.12