diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-25 12:20:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-25 12:20:12 (GMT) |
| commit | 41bda2792993bc04faf33a61eda46f53210349f5 (patch) | |
| tree | 1c3a22bc1c88903cdd5a3c88c038b345ed3a2d89 /doc/src/snippets | |
| parent | 41422ea0072d0af5fb378c3754b697ec0534a27f (diff) | |
| parent | 855ce69f17f570bc91e02bfb34d9e3f1699b3b18 (diff) | |
| download | Qt-41bda2792993bc04faf33a61eda46f53210349f5.zip Qt-41bda2792993bc04faf33a61eda46f53210349f5.tar.gz Qt-41bda2792993bc04faf33a61eda46f53210349f5.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNativeSocketEngine_win: Don't mess with linger settings
Cosmetic: move the "Alsa support..." line to a more appropriate place
Doc: Fixed broken link.
Doc: Added a warning about the Accelerated Graphics Driver example.
Doc: Fixed installation information for Qt for Embedded Linux.
fix copy-paste error
minor optimization
Autotest: add a test for allowing hostnames ending in dot
Fix QUrl::toAce for domains with dot at end
Fix NSCFNumber autorelease warning on Mac.
Add a reference to adjustSize() from the size property
Fix the parallel build of QtWebKit
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/doc_src_emb-install.qdoc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/src/snippets/code/doc_src_emb-install.qdoc b/doc/src/snippets/code/doc_src_emb-install.qdoc index 60775d2..f24f087 100644 --- a/doc/src/snippets/code/doc_src_emb-install.qdoc +++ b/doc/src/snippets/code/doc_src_emb-install.qdoc @@ -41,18 +41,22 @@ //! [0] cd <anywhere> -gunzip qt-embedded-linux-commercial-src-%VERSION%.tar.gz -tar xf qt-embedded-linux-commercial-src-%VERSION%.tar +gunzip qt-everywhere-opensource-src-%VERSION%.tar.gz +tar xf qt-everywhere-opensource-src-%VERSION%.tar //! [0] //! [1] -~/qt-embedded-linux-commercial-src-%VERSION% +~/qt-everywhere-opensource-src-%VERSION% //! [1] +//! [embedded help] +./configure -embedded -help +//! [embedded help] + //! [2] -cd ~/qt-embedded-linux-commercial-src-%VERSION% +cd ~/qt-everywhere-opensource-src-%VERSION% ./configure -embedded [architecture] //! [2] |