From 321687f03b25e71ee7be7bed35a8e615dcb7f381 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 13 Sep 2012 18:13:13 +0200 Subject: factor out qtAddToolEnv() so it's available for other users as well Change-Id: I2d5a14ae427575c07321ac532b13ee03308b837f Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_tool.prf | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'mkspecs/features/qt_tool.prf') diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 758d52444c..d17e06a7fa 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -64,22 +64,7 @@ INSTALLS += target QT_TOOL_ENV += deppath pluginpath } - for(env, QT_TOOL_ENV) { - value = $$eval($${env}.value) - !isEmpty(value) { - name = $$eval($${env}.name) - equals(QMAKE_DIR_SEP, /) { - contains($${env}.CONFIG, prepend): infix = \${$$name:+:\$$$name} - else: infix = - cmd = "$$name=$$join(value, :)$$infix $$cmd" - } else { - # Escape closing parens when expanding the variable, otherwise cmd confuses itself. - contains($${env}.CONFIG, prepend): infix = ;%$$name:)=^)% - else: infix = - cmd = "(set $$name=$$join(value, ;)$$infix) & $$cmd" - } - } - } + qtAddToolEnv(cmd, $$QT_TOOL_ENV) TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_$${MODULE}.pri -- cgit v1.2.3