summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-05-11 14:33:35 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2015-05-12 12:48:42 +0000
commita99a2316954a30f5891d46685b80f2d41bdf932d (patch)
tree52a2da3329c797cc9e9314d4cfa0cc56c0a0e3eb /doc
parent1209dbbacb91327d538cc455fdfa03c31e4e2e9a (diff)
Document -static-runtime argument for Qt 5.5 onwards
Change-Id: Ic26cabbc42aa7247a6078f5fdf26320340a1c461 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/installerfw-getting-started.qdoc7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index 044fd2ed3..8934e6350 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -71,11 +71,12 @@
\section3 Configuring Qt for Windows
- Before running configure you should tweak Qt to statically link in the C
+ Usually, you want to tweak Qt to statically link in the C
runtime library. This can be done by changing the default mkspec of
- your compiler.
+ your compiler (Qt 5.4) or by passing \c{-static-runtime} to configure (Qt 5.5
+ and newer).
- If you are using e.g. the Microsoft Visual Studio 2013 compiler, you edit
+ For Qt 5.4, you need to edit
\c{mkspecs\win32-msvc2013\qmake.conf} and replace in the CFLAGS sections
'-MD' with '-MT':