From c0efee2f265279a4ced90279ad2e7536c596f08c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 11 Dec 2015 14:14:13 +0100
Subject: add always_prepend mode to qtAddToolEnv()

this is just an optimization/clarification: variables which are known to
be never empty (like PATH) can be extended with less convoluted code.

Change-Id: Ib365bbec8301673ed1c874979b4de19bc983dab1
Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 mkspecs/features/qt_functions.prf | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index abb7439f18..6b72db6101 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -96,8 +96,10 @@ defineTest(qtAddToolEnv) {
         value = $$eval($${env}.value)
         !isEmpty(value) {
             name = $$eval($${env}.name)
+            config = $$eval($${env}.CONFIG)
             equals(ds, /) {
-                contains($${env}.CONFIG, prepend): infix = \${$$name:+:\$$$name}
+                contains(config, prepend): infix = \${$$name:+:\$$$name}
+                else: contains(config, always_prepend): infix = :\$$$name
                 else: infix =
                 # Under msys, this path is taken only in the non-system()
                 # case, so using shell_quote() always works.
@@ -108,13 +110,15 @@ defineTest(qtAddToolEnv) {
                 value ~= s,\\^,^^^^,g
                 value ~= s,!,^^!,g
                 value ~= s,\\),^),g
-                contains($${env}.CONFIG, prepend) {
+                contains(config, prepend) {
                     batch_sets += \
                         "if defined $$name (" \
                         "    set $$name=$$join(value, ;);!$$name!" \
                         ") else (" \
                         "    set $$name=$$join(value, ;)" \
                         ")"
+                } else: contains(config, always_prepend) {
+                    batch_sets += "(set $$name=$$join(value, ;);!$$name!)"
                 } else {
                     batch_sets += "(set $$name=$$join(value, ;))"
                 }
@@ -162,8 +166,10 @@ defineTest(qtAddTargetEnv) {
     deps = $$resolve_depends(deps, "QT.", ".depends" ".run_depends")
     !isEmpty(deps) {
         libs = libs
+        deppath.CONFIG = prepend
         equals(QMAKE_HOST.os, Windows) {
             libs = bins
+            deppath.CONFIG = always_prepend
             deppath.name = PATH
         } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
             deppath.name = LD_LIBRARY_PATH
@@ -188,7 +194,6 @@ defineTest(qtAddTargetEnv) {
             ptypes += $$eval(QT.$${dep}.plugin_types)
         }
         deppath.value = $$unique(deppath)
-        deppath.CONFIG = prepend
 
         pluginpath.value =
         ppaths = $$[QT_INSTALL_PLUGINS/get]
-- 
cgit v1.2.3