summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-01-16 14:32:56 (GMT)
committerEdwin Mons <edwin.mons@isode.com>2017-01-17 15:22:11 (GMT)
commite649c54daa666c99d2f934b223acd0262c05e11a (patch)
tree27262c34b711c2cef0276fe69bfcad326d2e427b /BuildTools
parenta2acaebfb02879ce5907077381210885f5c41e48 (diff)
downloadswift-e649c54daa666c99d2f934b223acd0262c05e11a.zip
swift-e649c54daa666c99d2f934b223acd0262c05e11a.tar.bz2
Add Qt bin path to SCons process' PATH environment variable
Test-Information: Tested scons dist=1 successfully on Windows 10 with Visual Studio 2015 and Qt 5.7.1. Change-Id: I41271f10367249e2e89fdba85f1d5c5305c548ff
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConscript.boot5
1 files changed, 5 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 031c556..d603ef4 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -137,6 +137,11 @@ else :
env = Environment(ENV = env_ENV, variables = vars, platform = ARGUMENTS.get("PLATFORM", None))
env = Environment(ENV = env_ENV, variables = vars, platform = ARGUMENTS.get("PLATFORM", None), TARGET_ARCH=env["win_target_arch"])
+if env["PLATFORM"] == "win32" and env["qt"] :
+ # This adds Qt's binary directory at the end of the PATH variable, so that
+ # windeployqt.exe is automatically detected and used in WindowsBundle.py.
+ os.environ["PATH"] = env['ENV']['PATH'] + ";" + env['qt'] + "\\bin"
+
Help(vars.GenerateHelpText(env))
# Workaround for missing Visual Studio 2012 support in SCons