Update configure options for Windows (Qt 5)

Fix the configure options for Windows. Also update the options in
the documentation according to the latest changes to INSTALL.

Change-Id: If9f4cd7b954fabecd80d0e38615790342367600e
Reviewed-by: Niels Weber <niels.weber@digia.com>
This commit is contained in:
Kai Koehne 2014-06-03 14:42:58 +02:00
parent 7e6b1dcba3
commit f70eb340ec
2 changed files with 4 additions and 4 deletions

View File

@ -54,7 +54,7 @@ Adjust the qmake.conf to have a real stand alone working installer:
Recommended configure options for Microsoft Windows:
configure.exe -opensource -release -static -accessibility -no-multimedia -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -nomake examples -nomake demos -skip qtquick1 -skip qtscript -skip qtlocation
configure -opensource -release -static -target xp -no-opengl -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtlocation -skip qtscript -skip qtsensors
### Linux & Mac OS X

View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Installer Framework.
@ -81,7 +81,7 @@
Windows:
\code
configure.exe -opensource -release -static -accessibility -no-multimedia -no-declarative -no-phonon -no-dbus -no-opengl -no-qt3support -no-webkit -no-xmlpatterns -nomake examples -nomake demos
configure -opensource -release -static -target xp -no-opengl -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtlocation -skip qtscript -skip qtsensors
\endcode
\section2 Configuring Qt for Linux and Mac OS X
@ -90,7 +90,7 @@
Mac OS X:
\code
configure -opensource -release -static -accessibility -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
configure -opensource -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-opengl -nomake examples -nomake tests -developer-build -skip qtquick1 -skip qtscript -skip qtlocation
\endcode
\section1 Setting up Qt Installer Framework