diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-05-11 14:33:35 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-05-12 12:48:42 +0000 |
| commit | a99a2316954a30f5891d46685b80f2d41bdf932d (patch) | |
| tree | 52a2da3329c797cc9e9314d4cfa0cc56c0a0e3eb | |
| parent | 1209dbbacb91327d538cc455fdfa03c31e4e2e9a (diff) | |
Document -static-runtime argument for Qt 5.5 onwards
Change-Id: Ic26cabbc42aa7247a6078f5fdf26320340a1c461
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| -rw-r--r-- | INSTALL | 11 | ||||
| -rw-r--r-- | doc/installerfw-getting-started.qdoc | 7 |
2 files changed, 11 insertions, 7 deletions
@@ -26,13 +26,13 @@ See the Qt documentation for the prerequisites and steps to build Qt from source ### Windows -Adjust the qmake.conf to have a real stand alone working installer: -Replace -MD, -MDd with -MT, -MTD in the CFLAGS lines +For Qt 5.4, you need to adjust the respective qmake.conf to have a real stand alone +working installer. Replace -MD, -MDd with -MT, -MTD in the CFLAGS lines. 'git diff' should show you something like: ---- a/mkspecs/win32-msvc20XX/qmake.conf -+++ b/mkspecs/win32-msvc20XX/qmake.conf +--- a/mkspecs/win32-msvc2013/qmake.conf ++++ b/mkspecs/win32-msvc2013/qmake.conf QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t -FS QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 @@ -46,6 +46,9 @@ Replace -MD, -MDd with -MT, -MTD in the CFLAGS lines QMAKE_CFLAGS_LTCG = -GL QMAKE_CFLAGS_MP = -MP +From Qt 5.5 onwards, you can achieve the same by passing -static-runtime to +configure. + Recommended configuration options for Microsoft Windows: configure -prefix %CD%\qtbase -release -static -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns 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': |