From d3518b752583d6d725f4adb14f804ae6d7cfa650 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 11 Dec 2015 14:53:18 +0100 Subject: Revert "use bindir instead of libdir when launching tools on windows" proper prefix builds don't have the redundant .dlls in bin (the copy step is simply omitted), so this is broken. the change would have to be done atomically with making DLLDESTDIR sane. This reverts commit 9b2e98245a95bec9179edf648d7b562d2d1cb692. Task-number: QTBUG-50065 Change-Id: I9ce0a2d1147a1a2d4bd2f22e619d5c737864a637 Reviewed-by: Romain Pokrzywka Reviewed-by: Tim Blechmann Reviewed-by: Frederik Gladhorn Reviewed-by: Simon Hausmann --- mkspecs/features/qt_functions.prf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 6b72db6101..c23d006d82 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -165,10 +165,8 @@ defineTest(qtAddTargetEnv) { deps = $$replace($$2, -private$, _private) 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) { @@ -188,9 +186,9 @@ defineTest(qtAddTargetEnv) { ptypes = for(dep, deps) { isEmpty(3): \ - deppath += $$shell_path($$eval(QT.$${dep}.$$libs)) + deppath += $$shell_path($$eval(QT.$${dep}.libs)) else: \ - deppath += $$system_path($$eval(QT.$${dep}.$$libs)) + deppath += $$system_path($$eval(QT.$${dep}.libs)) ptypes += $$eval(QT.$${dep}.plugin_types) } deppath.value = $$unique(deppath) -- cgit v1.2.3