summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INSTALL13
-rw-r--r--doc/installerfw-getting-started.qdoc15
2 files changed, 21 insertions, 7 deletions
diff --git a/INSTALL b/INSTALL
index 311d8275b..cebdf7ae5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -57,11 +57,18 @@ Recommended configure options for Microsoft Windows:
configure -prefix %CD%\qtbase -release -static -target xp -no-opengl -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtlocation -skip qtscript -skip qtsensors
-### Linux & Mac OS X
+### Linux
-Recommended configure options for Linux and Mac OS X:
+Recommended configure options for Linux:
+
+configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -no-opengl -nomake examples -nomake tests -developer-build -skip qtquick1 -skip qtscript -skip qtlocation
+
+### OS X
+
+Recommended configure options for OS X:
+
+configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-opengl -nomake examples -nomake tests -developer-build -skip qtquick1 -skip qtscript -skip qtlocation
-./configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-opengl -nomake examples -nomake tests -developer-build -skip qtquick1 -skip qtscript -skip qtlocation
Build the Framework
---------------------
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index eb5d51d5d..ff986c753 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -90,13 +90,20 @@
configure -prefix %CD%\qtbase -release -static -target xp -no-opengl -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtlocation -skip qtscript -skip qtsensors
\endcode
- \section3 Configuring Qt for Linux and OS X
+ \section3 Configuring Qt for Linux
- We recommend that you use the following configuration options for Linux and
- OS X:
+ 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 -no-opengl -nomake examples -nomake tests -developer-build -skip qtquick1 -skip qtscript -skip qtlocation
+ configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -no-opengl -nomake examples -nomake tests -developer-build -skip qtquick1 -skip qtscript -skip qtlocation
+ \endcode
+
+ \section3 Configuring Qt for OS X
+
+ 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-opengl -nomake examples -nomake tests -developer-build -skip qtquick1 -skip qtscript -skip qtlocation
\endcode
\section2 Setting up Qt Installer Framework