From 67f20d66e4f8895492fad0944403a4947263ec5a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 18 Feb 2013 13:53:46 +0100 Subject: [PATCH] remove pointless conditionals and expansions from qtLibraryTarget() this function is called only from library TEMPLATEs, and always with exactly one word as the only argument. Change-Id: I6282e3826791f89e6cf89dde625c8166e4e56028 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_functions.prf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index bac7ca1751..055be775f1 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -19,10 +19,7 @@ defineReplace(qtLibraryTarget) { MAJOR_VERSION = $$section(VERSION, ., 0, 0) LIBRARY_NAME ~= s,^Qt,Qt$$MAJOR_VERSION, } - unset(LIBRARY_SUFFIX) - contains(TEMPLATE, .*lib):LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() - isEmpty(LIBRARY_SUFFIX):return($$LIBRARY_NAME) - else:return($$member(LIBRARY_NAME, 0)$$LIBRARY_SUFFIX) + return($$LIBRARY_NAME$$qtPlatformTargetSuffix()) } defineTest(qtAddLibrary) {