From 1ebef55cf796c86cdcb693fc01ae39ed688872f8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 17 Jun 2013 12:22:01 +0200 Subject: [PATCH] remove pointless return code checking qtAddModule() always returns true anyway. the real checking is done by qtAddModules() and qtAddLibrary() itself. Change-Id: Ieed821acc36dc57ca52aec3e6b2dd6513be9b6c1 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_functions.prf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index f8021a2f5a..b043f4dae7 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -28,8 +28,8 @@ defineTest(qtAddLibrary) { # Reverse-engineer the module name from the library name. for(var, QT_MODULES) { isEqual(QT.$${var}.name, $$1) { - qtAddModule($$var, , LIBS):return(true):break() - return(false):break() # Yes, the break is insanity. But necessary. + qtAddModule($$var, , LIBS) + return(true):break() # Yes, the break is insanity. But necessary. } } error("No module matching library '$$1' found.") @@ -130,7 +130,6 @@ defineTest(qtAddModule) { export(QMAKE_RPATHDIR) export(QMAKE_RPATHLINKDIR) export(PRE_TARGETDEPS) - return(true) } # qt variable, libs variable