From 23762682c1e685fb93182031cf71f96d24d0f3f4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 18 Feb 2013 14:20:29 +0100 Subject: simplify qtAddModule() by using $$qtPlatformTargetSuffix() Change-Id: I02b6c1eb2db0c8a36c50b1ec3c79dea215fba03a Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_functions.prf | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 055be775f1..478c255836 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -105,12 +105,7 @@ defineTest(qtAddModule) { isEmpty(LINKAGE) { !isEmpty(MODULE_LIBS_ADD): LINKAGE = -L$$MODULE_LIBS_ADD - lib = - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - win32: lib = $${MODULE_NAME}$${QT_LIBINFIX}d - mac: lib = $${MODULE_NAME}$${QT_LIBINFIX}_debug - } - isEmpty(lib): lib = $${MODULE_NAME}$${QT_LIBINFIX} + lib = $${MODULE_NAME}$${QT_LIBINFIX}$$qtPlatformTargetSuffix() LINKAGE += -l$$lib contains(QT_CONFIG, rpath): QMAKE_RPATHDIR *= $$eval(QT.$${1}.rpath) -- cgit v1.2.3