summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-06-03 14:42:58 +0200
committerKai Koehne <kai.koehne@digia.com>2014-06-03 16:09:48 +0200
commitf70eb340ece16bf1bb11d5572e8d65864dcd29bd (patch)
tree1035c302bd723aa0275ce4b20b98e7c0124d0fe8
parent7e6b1dcba3c4b8388dc39b484e7c8c5ecd7a7226 (diff)
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>
-rw-r--r--INSTALL2
-rw-r--r--doc/installerfw-getting-started.qdoc6
2 files changed, 4 insertions, 4 deletions
diff --git a/INSTALL b/INSTALL
index 1cea4c305..a1f5ed44d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -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
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index 67dd4de14..96fdea972 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -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