diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-24 15:23:16 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-24 15:23:16 (GMT) |
| commit | 8534bf99bb644c6ef410415333b479967155c829 (patch) | |
| tree | 3fc0e267c403c8eebed3d4ece7fec5f6575432fb /doc | |
| parent | 97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0 (diff) | |
| parent | a0c8e134a284d45520dd3a229e68dbcd155299e6 (diff) | |
| download | Qt-8534bf99bb644c6ef410415333b479967155c829.zip Qt-8534bf99bb644c6ef410415333b479967155c829.tar.gz Qt-8534bf99bb644c6ef410415333b479967155c829.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/getting-started/installation.qdoc | 7 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 1a5cd99..057629d 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -599,6 +599,13 @@ If you are using pre-built binaries, follow the instructions given in the emulator. This is done by locating the Carbide.c++ submenu on the Start menu, and choosing "Configure environment for WINSCW command line". + If you are planning to use abld (the default build system that comes with the S60 SDK) + to build Qt, you will also need to set the following environment variable: + + \snippet doc/src/snippets/code/doc_src_installation.qdoc 33 + + This is not necessary for other applications, only when building Qt. + \o Configure Qt To configure Qt for the Symbian platform, do: diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 3563a64..50e29d0 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -216,3 +216,7 @@ bldmake bldfiles abld build winscw udeb abld build gcce urel //! [32] + +//! [33] +SYMBIANBUILD_DEPENDENCYOFF=1 +//! [33] |