diff options
| author | axis <qt-info@nokia.com> | 2010-07-15 09:26:14 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-21 09:40:18 (GMT) |
| commit | d9e75d77ac3da86c32d280895beac2936d8869ca (patch) | |
| tree | 7157c0b72affc3e290f58785168a5ecd2744a9bd | |
| parent | 74868367dce9038dfbac574196e6b2d75ab977e7 (diff) | |
| download | Qt-d9e75d77ac3da86c32d280895beac2936d8869ca.zip Qt-d9e75d77ac3da86c32d280895beac2936d8869ca.tar.gz Qt-d9e75d77ac3da86c32d280895beac2936d8869ca.tar.bz2 | |
Removed the need to specify -arch symbian when compiling on Linux.
Task: QTBUG-11385
RevBy: Jason Barron
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -2935,6 +2935,8 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then esac elif [ "$XPLATFORM_MINGW" = "yes" ]; then [ -z "$CFG_ARCH" ] && CFG_ARCH="windows" +elif echo "$XPLATFORM" | grep symbian > /dev/null; then + CFG_ARCH=symbian elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then CFG_ARCH=$CFG_HOST_ARCH fi diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 985f3da..b4dd8fa 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] |