diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-01-23 16:20:48 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2013-01-23 17:05:30 +0100 |
| commit | 9093201505a07a6b4aeae99ccf2199ce1277e1b8 (patch) | |
| tree | 501dd4e11fa716269e1d9d9df238e57a4fec241c | |
| parent | 01cbce9e057a1ca951d99558feaea5b6f7620541 (diff) | |
Unify order & content of configure arguments
Remove superfluous -platform argument from README, and
-qt-sql-sqlite -plugin-sql-sqlite from documentation.
Reorder arguments on Unix and Windows to make them comparable.
Change-Id: Ibe7ae670da6b3ef06ec02dbb5c1cc92d5e65d411
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | doc/installerfw-getting-started.qdoc | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -30,10 +30,10 @@ adjust the qmake.conf to have a real stand alone working installer (at the momen QMAKE_CFLAGS_LTCG = -GL Recommended configure options for windows: -configure.exe -platform win32-msvc20XX -release -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-multimedia -no-declarative -nomake examples -nomake demos -opensource +configure.exe -opensource -release -static -no-multimedia -no-declarative -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -nomake examples -nomake demos Recommended configure options for Linux: -configure -nomake examples -nomake demos -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -opensource -developer-build -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -release +configure -developer-build -opensource -release -static -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -no-svg -nomake examples -nomake demos == Create an Installer == diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index 168d119c8..2a5c66707 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -81,7 +81,7 @@ Windows: \code - configure.exe -release -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-multimedia -no-declarative -nomake examples -nomake demos -qt-sql-sqlite -plugin-sql-sqlite -opensource + configure.exe -opensource -release -static -no-multimedia -no-declarative -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -nomake examples -nomake demos \endcode \section2 Configuring Qt for Linux and Mac OS X @@ -90,7 +90,7 @@ Mac OS X: \code - configure -nomake examples -nomake demos -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -opensource -developer-build -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -release + configure -developer-build -opensource -release -static -qt-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -no-svg -nomake examples -nomake demos \endcode \section1 Setting up Qt Installer Framework |