diff options
| author | axis <qt-info@nokia.com> | 2011-03-14 10:40:58 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-14 10:40:58 (GMT) |
| commit | d8aa0f54f8e6f5d2a95965203b7f60c11297dacf (patch) | |
| tree | 27421db20ab68dff072f0d9a7735742d20855993 /doc | |
| parent | 8f59ff17926e246ff732ce40890a3a7625b8e826 (diff) | |
| parent | d45c67d01ce28f4fb85eace1116ca751a8f02827 (diff) | |
| download | Qt-d8aa0f54f8e6f5d2a95965203b7f60c11297dacf.zip Qt-d8aa0f54f8e6f5d2a95965203b7f60c11297dacf.tar.gz Qt-d8aa0f54f8e6f5d2a95965203b7f60c11297dacf.tar.bz2 | |
Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 1a87566..5aaa2b0 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -250,12 +250,12 @@ export PATH //! [38] cd /home/user/qt/%VERSION% -./configure -platform linux-g++ -xplatform symbian/linux-armcc +./configure -platform linux-g++ -xplatform symbian-armcc //! [38] //! [39] cd /home/user/qt/%VERSION% -./configure -platform linux-g++ -xplatform symbian/linux-gcce -no-webkit +./configure -platform linux-g++ -xplatform symbian-gcce -no-webkit //! [39] //! [40] |