summaryrefslogtreecommitdiffstats
path: root/doc/installerfw-getting-started.qdoc
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-06-30 15:03:32 +0200
committerKai Koehne <kai.koehne@digia.com>2014-07-01 11:32:49 +0200
commiteb719977c3547ce8e2d53820272f18e2fd063258 (patch)
treead3f06bc26d7e4916591c15540b8c91b55a0c210 /doc/installerfw-getting-started.qdoc
parent8351ffe23c7fd630f9a15baaea1353971e809d21 (diff)
Linux: Add -qt-xcb to recommended configure flags
Also drop trailing './' in command line, and adapt to new Mac naming conventions: The OS is just "OS X", not "Mac OS X" anymore. Change-Id: I95c18080261e54ed8abe1b9307340e834934fb61 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'doc/installerfw-getting-started.qdoc')
-rw-r--r--doc/installerfw-getting-started.qdoc15
1 files changed, 11 insertions, 4 deletions
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