From ae789544e4a239a1e26ab96fd07603cee016cd18 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 20 Sep 2012 12:17:30 +0200 Subject: [PATCH] simplify determination of static plugin link line qt_debug & qt_release are dead, so collapse the respective paths and use an existing function. Change-Id: Ie800be477186a6eab72682d367b24e83c3b9bbc0 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt.prf | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 8f797a5960..28f8c8dd6d 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -38,16 +38,6 @@ plugin { #Qt plugins QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { for(QTPLUG, $$list($$lower($$unique($$QT_CURRENT_VERIFY)))) { - qplugin_style = - !qt_debug:!qt_release { - CONFIG(debug, debug|release):qplugin_style = debug - else:qplugin_style = release - } else:CONFIG(qt_debug, qt_debug|qt_release) { - qplugin_style = debug - } else { - qplugin_style = release - } - # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. ACCESSIBLEPLUGINS = qtaccessiblewidgets qtaccessiblecompatwidgets @@ -86,12 +76,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { target_qt:isEqual(TARGET, QTPLUG) { warning($$TARGET cannot have a QTPLUGIN of $$QTPLUG) } else { - QT_LINKAGE = -l$${QTPLUG} - win32 { - CONFIG(debug, debug|release):QT_LINKAGE = -l$${QTPLUG}d - } else:mac { - isEqual(qplugin_style, debug):QT_LINKAGE = -l$${QTPLUG}_debug - } + QT_LINKAGE = -l$${QTPLUG}$$qtPlatformTargetSuffix() } # Only link against plugin in static builds