summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-05-07 07:52:42 (GMT)
committerTobias Markmann <tm@ayena.de>2015-05-07 07:52:42 (GMT)
commit39342e46bdf3a2b12bff5bd267809bf4dfc277b5 (patch)
treedc12ca18b7de684b36d2f77d467e73d9b4c6ed0f /BuildTools/SCons
parent285bf92672e618124cedf554f39c7f30824453bf (diff)
downloadswift-39342e46bdf3a2b12bff5bd267809bf4dfc277b5.zip
swift-39342e46bdf3a2b12bff5bd267809bf4dfc277b5.tar.bz2
Add support for Qt 5.4.1 to build and distribution process on Windows
Test-Information: Tested with Qt 5.3.2 and Qt 5.4.1 from qt.io website. Change-Id: Iada3e64e530d8a5b53b8b5c8943bcafbd9bd6c64
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/Tools/WindowsBundle.py11
-rw-r--r--BuildTools/SCons/Tools/qt4.py2
2 files changed, 11 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index 10821e9..744d5c8 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -16,10 +16,17 @@ def which(program_name):
def generate(env) :
def captureWinDeployQtMapping(release = True):
p = False
+
+ qt_bin_folder = ""
+ if "QTDIR" in env:
+ qt_bin_folder = env["QTDIR"] + "\\bin;"
+
+ environ = {"PATH": qt_bin_folder + os.getenv("PATH"), "TEMP": os.getenv("TEMP"), "TMP": os.getenv("TMP")}
+
if release:
- p = subprocess.Popen(['windeployqt', '--release', '--dry-run', '--list', 'mapping', 'Swift.exe'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ p = subprocess.Popen(['windeployqt', '--release', '--dry-run', '--list', 'mapping', 'Swift.exe'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=environ)
else:
- p = subprocess.Popen(['windeployqt', '--debug', '--dry-run', '--list', 'mapping', 'Swift.exe'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ p = subprocess.Popen(['windeployqt', '--debug', '--dry-run', '--list', 'mapping', 'Swift.exe'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=environ)
if p:
stdout, stderr = p.communicate()
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index be8621b..17292d9 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -439,6 +439,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
'QtWidgets',
'QtMultimedia',
'QtWebKitWidgets',
+ 'QtWebChannel',
]
if sys.platform != "win32" and sys.platform != "darwin" and not crosscompiling :
validModules += ['QtX11Extras']
@@ -542,6 +543,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
else :
self["QT4_MOCCPPPATH"] = self["CPPPATH"]
self.AppendUnique(LIBPATH=[os.path.join('$QTDIR','lib')])
+ self.PrependUnique(LIBS=["shell32"])
return
if sys.platform=="darwin" :