diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-01-07 07:54:10 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-01-07 10:10:20 +0000 |
| commit | 4d289c333fd8cc9ca795c24c37adb2e8e40c1653 (patch) | |
| tree | ff6621f8b42684c3e7dd6e3698b689406a56e135 | |
| parent | a4b7655164d738313e2b6fdbb846dbf07f2a8950 (diff) | |
Minor documentation fixes
Change-Id: I4a8c1ca489ed7d7779c5235101fb57be8bd88274
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | doc/installerfw-getting-started.qdoc | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -15,9 +15,9 @@ http://code.qt.io/cgit/installer-framework/installer-framework.git/ Build a static Qt --------------------- -Building the Qt Installer Framework from sources requires Qt version 5.9.x. - 5.12.x. +Building the Qt Installer Framework from sources requires Qt version between 5.9.0 and 5.12.x. Supported compilers are MSVC 2013 or newer, GCC 4.7 or newer, -and Clang 3.1 or newer. Currently the tested combination for Windows is Qt5.12.4 with MSVC 2015. +and Clang 3.1 or newer. Currently, the tested combination for Windows is Qt 5.12.4 with MSVC 2015. If you want to ship your installer as a single file you have to build Qt and the Qt Installer Framework statically. diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index a1187c021..b087a2b61 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -47,7 +47,7 @@ \list \li Microsoft Windows 7, and later \li Ubuntu Linux 16.04, and later - \li OS X 10.12, and later + \li macOS 10.12, and later \endlist \section1 Building from Sources @@ -59,8 +59,8 @@ \section2 Supported Compilers The Qt Installer Framework can be compiled with Microsoft Visual Studio - 2013 and newer, GCC 4.7 and newer, and Clang 3.1 and newer. Currently the - tested combination for Windows is Qt5.12.4 with MSVC 2015. + 2013 and newer, GCC 4.7 and newer, and Clang 3.1 and newer. Currently, the + tested combination for Windows is Qt 5.12.4 with MSVC 2015. \section2 Configuring Qt @@ -70,7 +70,7 @@ from http://doc.qt.io/qt-5/ssl.html if you are statically linking against OpenSSL libraries. - The required Qt version is 5.9.x - 5.12.x. + Qt versions between 5.9.0 and 5.12.x are supported. \section3 Configuring Qt for Windows |