diff options
| author | axis <qt-info@nokia.com> | 2009-07-03 13:15:53 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 14:51:05 (GMT) |
| commit | ae167cdd9d9075ccadfacd26ec66aa191f513692 (patch) | |
| tree | 99babf8fff797647f662121d58e3935988bd5571 | |
| parent | e4a0fb4d51a359a626856d3febe0822953c81bc7 (diff) | |
| download | Qt-ae167cdd9d9075ccadfacd26ec66aa191f513692.zip Qt-ae167cdd9d9075ccadfacd26ec66aa191f513692.tar.gz Qt-ae167cdd9d9075ccadfacd26ec66aa191f513692.tar.bz2 | |
Added various defines and includes to make Qt for S60 compile.
| -rw-r--r-- | mkspecs/common/armcc.conf | 2 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf index d6ea5d4..e4e863c 100644 --- a/mkspecs/common/armcc.conf +++ b/mkspecs/common/armcc.conf @@ -3,7 +3,7 @@ # QMAKE_CC = armcc -QMAKE_CFLAGS += +QMAKE_CFLAGS += --preinclude rvct2_2.h --diag_suppress 654 QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += QMAKE_CFLAGS_WARN_OFF += -W diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index e4c2801..701390f 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -1,5 +1,5 @@ # -# qmake configuration for linux-g++ +# qmake configuration for symbian/linux-armcc # MAKEFILE_GENERATOR = UNIX @@ -29,4 +29,8 @@ QMAKE_DEL_DIR = rmdir QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p +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 + include(../../common/unix.conf) |