diff options
| author | axis <qt-info@nokia.com> | 2010-07-21 14:23:43 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-21 14:23:43 (GMT) |
| commit | ccfb67704285f60ce31bb05538f08ca6f32c6f1d (patch) | |
| tree | 1b90180dfe6900b8d36c7f33bf8bbc2b10bf33fb /doc | |
| parent | 11d626de5fd87fc8cbd9d685bde8217c7ad7fae6 (diff) | |
| parent | ae64f51f092d7ffb20cb50b0e9cd9b019c0e8831 (diff) | |
| download | Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.zip Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.tar.gz Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.tar.bz2 | |
Merge branch 'raptorConfigurePatches' into 4.7-s60
Conflicts:
configure
src/sql/drivers/drivers.pri
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 c46159c..0593567 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 -arch symbian +./configure -platform linux-g++ -xplatform symbian/linux-armcc //! [38] //! [39] cd /home/user/qt/%VERSION% -./configure -platform linux-g++ -xplatform symbian/linux-gcce -arch symbian -no-webkit +./configure -platform linux-g++ -xplatform symbian/linux-gcce -no-webkit //! [39] //! [40] |