diff options
authorTobias Markmann <>2015-02-05 10:18:47 (GMT)
committerSwift Review <>2015-02-06 13:38:42 (GMT)
commit9f6d02730918faa041afc39ec51b57675b4c5c1d (patch)
tree69292bfe21abe04541e0f6eccc31d59fc97763fd /Documentation
parent8421b895f5697ebf680c124f84a68dcdea029c62 (diff)
Use windeployqt.exe if available and Win distribution documentation fix
If windeployqt.exe is available for Qt5, it will be used to detect which Qt DLLs to put in the Windows distribution and its dependencies correctly. Added a note to our Windows building documentation about the VS redistributable. Test-Information: Tested building a MSI package on Windows 8.1 Pro with Qt 5.3.2 32-bit msvc2013_opengl which successfully installs and runs. Change-Id: I786da40d6467f1de8e64bfae275f8363ac1d5ba8
Diffstat (limited to 'Documentation')
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/BuildingOnWindows.txt b/Documentation/BuildingOnWindows.txt
index a2d9948..c411d62 100644
--- a/Documentation/BuildingOnWindows.txt
+++ b/Documentation/BuildingOnWindows.txt
@@ -42,12 +42,13 @@ Running tests
Packaging Swift
For packaging use:
-- Microsoft Visual C++ Express 2008
+- Microsoft Visual C++ Express 2008 or Microsoft VS 2013 Express
- No OpenSSL
- WiX
+- Download the C++ redistributable package from Microsoft and put it at C:\Program Files (x86)\Common Files\Merge Modules\
- should contain:
qt = "c:\\qt\\4.7.4"
- vcredist = "c:\\Program Files\\Common Files\\Merge Modules"
+ vcredist = "C:\\Program Files (x86)\\Common Files\\Merge Modules\\vcredist_x86.exe"
debug = 1
optimize = 1
wix_bindir = "c:\\program files\\Windows Installer XML v3.5\\bin"