diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 11:26:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 11:26:09 +0100 |
| commit | 40cc6dea5b1b5d2570468adcc83943f8c8bd112e (patch) | |
| tree | a314707e11905a9f8bab8d6a93d4532194af371a /Tools/Scripts/generate-win32-export-forwards | |
| parent | 0b30e4490f7500ade1868fb33cea8705418c90bb (diff) | |
| parent | c176f1fbe8ed0d87c507811f4c0e4d67a71bc890 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
.qmake.conf
Change-Id: Id65b546f295897cd386125d2d3d4160051cc7d22
Diffstat (limited to 'Tools/Scripts/generate-win32-export-forwards')
| -rwxr-xr-x | Tools/Scripts/generate-win32-export-forwards | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/Scripts/generate-win32-export-forwards b/Tools/Scripts/generate-win32-export-forwards index a160abb18..37375b77b 100755 --- a/Tools/Scripts/generate-win32-export-forwards +++ b/Tools/Scripts/generate-win32-export-forwards @@ -28,7 +28,7 @@ import sys import re def exportForwardsForLibrary(library): - dumpBin = subprocess.Popen("dumpbin /directives " + library, stdout=subprocess.PIPE, universal_newlines=True) + dumpBin = subprocess.Popen(["dumpbin.exe", "-directives", library], stdout=subprocess.PIPE, universal_newlines=True) output = dumpBin.communicate()[0] return output |