summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2019-12-30 14:08:58 +0200
committerKatja Marttila <katja.marttila@qt.io>2020-01-07 05:31:14 +0000
commita4b7655164d738313e2b6fdbb846dbf07f2a8950 (patch)
tree8a88adb635cc42e6bea861a927090013fe3b161b
parent732976947d913d529bff9be588290ca257cebd5d (diff)
Update build instructions to documentation
Change-Id: I111829be3183a1e195af4f79c914e6309f9ada9f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r--INSTALL4
-rw-r--r--doc/installerfw-getting-started.qdoc11
2 files changed, 8 insertions, 7 deletions
diff --git a/INSTALL b/INSTALL
index 195f59766..3f1be664c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -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.
+Building the Qt Installer Framework from sources requires Qt version 5.9.x. - 5.12.x.
Supported compilers are MSVC 2013 or newer, GCC 4.7 or newer,
-and Clang 3.1 or newer.
+and Clang 3.1 or newer. Currently the tested combination for Windows is Qt5.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 7d3300138..a1187c021 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -45,9 +45,9 @@
The installers have been tested on the following platforms:
\list
- \li Microsoft Windows XP, and later
- \li Ubuntu Linux 11.10, and later
- \li OS X 10.7, and later
+ \li Microsoft Windows 7, and later
+ \li Ubuntu Linux 16.04, and later
+ \li OS X 10.12, and later
\endlist
\section1 Building from Sources
@@ -59,7 +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.
+ 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.
\section2 Configuring Qt
@@ -69,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.
+ The required Qt version is 5.9.x - 5.12.x.
\section3 Configuring Qt for Windows