diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-02-11 12:51:48 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-02-11 12:51:48 (GMT) |
| commit | 1c05257ed6de27c7d9dcc90f23f868035eb738e5 (patch) | |
| tree | d9737c0144e23187f445a8ae4e71cd5f83c7456c /mkspecs | |
| parent | 5ec67c969dce335a26c402b73bb19a6751401871 (diff) | |
| download | Qt-1c05257ed6de27c7d9dcc90f23f868035eb738e5.zip Qt-1c05257ed6de27c7d9dcc90f23f868035eb738e5.tar.gz Qt-1c05257ed6de27c7d9dcc90f23f868035eb738e5.tar.bz2 | |
Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
Remove the define of _STLP_NO_EXCEPTION_HEADER after OpenC team's suggestion.
Remove the hardcoded include path for openc, it is already provided by mkspecs/features/symbian/platform_paths.prf.
RevBy: Miikka Heikkinen
Backport from 7c12d841fb2e2963b506c1ffc857cdd88bf78f6c in master.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/symbian/linux-gcce/qmake.conf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf index 4c346da..62cc9ae 100644 --- a/mkspecs/symbian/linux-gcce/qmake.conf +++ b/mkspecs/symbian/linux-gcce/qmake.conf @@ -50,8 +50,7 @@ QMAKE_LFLAGS_NOUNDEF = QMAKE_LFLAGS_RPATH = --rpath= DEFINES += __GCCE__ \ - UNICODE \ - _STLP_NO_EXCEPTION_HEADER + UNICODE QMAKE_LFLAGS_APP += --entry=_E32Startup -u _E32Startup QMAKE_LFLAGS_SHLIB += --default-symver --entry=_E32Dll -u _E32Dll @@ -89,7 +88,5 @@ INCLUDEPATH = ${EPOCROOT}/epoc32/include/ \ $${EPOCROOT}/epoc32/include/variant \ $${EPOCROOT}/epoc32/include/stdapis \ $${EPOCROOT}/epoc32/include/gcce \ - ${EPOCROOT}/epoc32/include/stdapis/sys \ - ${EPOCROOT}/epoc32/include/stdapis/stlport \ $$INCLUDEPATH |