summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2019-06-14 12:52:48 +0300
committerKatja Marttila <katja.marttila@qt.io>2019-08-13 10:48:51 +0000
commit18a722ade4dfe1564c014489b5acba77755e5d61 (patch)
treed82d5ee5309e577ca624da252c040395793b605e
parent670e8b69f30cc64b1d4407e72847f3b6768dae2c (diff)
Doc: Update getting-started page
Task-number: QTIFW-1185 Change-Id: I602425589b3b2e0482d025a02b06f4b4c27ac330 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--doc/installerfw-getting-started.qdoc27
1 files changed, 22 insertions, 5 deletions
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index e231e0f95..f3832ddae 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -65,9 +65,11 @@
If you use a statically built Qt to build the Qt Installer Framework
you do not have to deliver Qt libraries, which enables you to distribute
- installers as one file.
+ installers as one file. Please read SSL Import and Export Restrictions
+ from http://doc.qt.io/qt-5/ssl.html if you are statically linking against
+ OpenSSL libraries.
- The minimum required Qt version is 5.5.
+ The required Qt version is 5.9.x.
\section3 Configuring Qt for Windows
@@ -75,16 +77,26 @@
Windows:
\code
- configure -prefix %CD%\qtbase -release -static -static-runtime -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 -skip qt3d
+ configure -prefix %CD%\qtbase -release -static -static-runtime -accessibility -no-icu -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests
\endcode
+ Build Qt:
+ \code
+ nmake (or 'mingw32-make') module-qtbase module-qtdeclarative module-qttools module-qttranslations module-qtwinextras
+ \endcode
+
\section3 Configuring Qt for Linux
We recommend that you use the following configuration options for Linux:
\code
- configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -no-icu -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 -skip qt3d
+ configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput2 -no-sm -no-icu -nomake examples -nomake tests -no-libudev
+ \endcode
+
+ Build Qt:
+ \code
+ make module-qtbase module-qtdeclarative module-qttools module-qttranslations
\endcode
\section3 Configuring Qt for OS X
@@ -92,7 +104,12 @@
We recommend that you use the following configuration options for OS X:
\code
- configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -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 -skip qt3d
+ configure -prefix $PWD/qtbase -release -static -no-securetransport -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -no-freetype
+ \endcode
+
+ Build Qt:
+ \code
+ make module-qtbase module-qtdeclarative module-qttools module-qttranslations
\endcode
\section2 Setting up Qt Installer Framework