From b6f8557af805132ecac16e33fcda1f750988af10 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 7 Mar 2013 17:17:12 +0100
Subject: [PATCH] fix LD_LIBRARY_PATH setup of check targets

amends 4c34b418

Change-Id: Id9d214fe936d947aaea4a56fd724ad50381032e1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 mkspecs/features/qt_functions.prf | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 478c255836..8cd2473224 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -236,13 +236,10 @@ defineTest(qtAddToolEnv) {
 
 defineTest(qtAddTargetEnv) {
     deps = $$replace(QT, -private$, )
-    deps = $$resolve_depends(deps, "QT.")
+    deps = $$resolve_depends(deps, "QT.", ".depends" ".private_depends" ".run_depends")
     !isEmpty(deps) {
-        for(dep, deps) {
+        for(dep, deps): \
             deppath += $$shell_path($$eval(QT.$${dep}.libs))
-            for(rpath, QT.$${dep}.rpath_link): \
-                deppath += $$shell_path($$rpath)
-        }
         equals(QMAKE_HOST.os, Windows) {
             deppath.name = PATH
         } else:contains(QMAKE_HOST.os, Linux|FreeBSD) {