diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-24 23:19:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-24 23:19:36 (GMT) |
| commit | ae694b0895fa9e462c6146d157a228dd687f8870 (patch) | |
| tree | 3854e3d7fc1b62dfc23930db8409a4b96e5eec05 /doc/src/snippets/code | |
| parent | 4d1c8407c1ac16b6288c3aa0f7c2118d2748f348 (diff) | |
| parent | 9a46748375396ab84cd87baf3bdfe683a2803668 (diff) | |
| download | Qt-ae694b0895fa9e462c6146d157a228dd687f8870.zip Qt-ae694b0895fa9e462c6146d157a228dd687f8870.tar.gz Qt-ae694b0895fa9e462c6146d157a228dd687f8870.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:
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/code')
| -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] |