summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-07-10 08:39:13 (GMT)
committeraxis <qt-info@nokia.com>2009-10-23 14:53:23 (GMT)
commit2b41ee8a959b5c7fcbd6c275e4dac639cd09c25b (patch)
treebe68bb1b0d8e34451f7308053b96eb7793591c31 /mkspecs
parente897f44c17994f2d79a5456dc53a29b7c5fcf554 (diff)
downloadQt-2b41ee8a959b5c7fcbd6c275e4dac639cd09c25b.zip
Qt-2b41ee8a959b5c7fcbd6c275e4dac639cd09c25b.tar.gz
Qt-2b41ee8a959b5c7fcbd6c275e4dac639cd09c25b.tar.bz2
Temporarily fixed the architecture for S60.
This should ideally be detected by configure, but we hack it for now. This patch should be reverted.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/symbian/linux-armcc/qmake.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
index 2d43b4a..6b97de9 100644
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ b/mkspecs/symbian/linux-armcc/qmake.conf
@@ -26,6 +26,8 @@ QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
+QT_ARCH = arm
+
DEFINES += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__ __EPOC32__ __MARM__ __EABI__ __ARMCC__ __ARMcc_2__ __ARMCC_2_2__ __MARM_ARMV5__ __DLL__ _UNICODE
INCLUDEPATH += $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off