From e649c54daa666c99d2f934b223acd0262c05e11a Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Mon, 16 Jan 2017 15:32:56 +0100
Subject: 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

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
-- 
cgit v0.10.2-6-g49f6