diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 05:25:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 05:25:40 (GMT) |
| commit | 267d7ed88d72d2fb3230a1ba5c3aa6b41f9ac79a (patch) | |
| tree | 0b07605309a4057b2b7dc7eab938b4b26d0bd17e /mkspecs | |
| parent | a2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25 (diff) | |
| parent | 778b9dcb5ad6aba8b0548719c2674e3e6ad66c58 (diff) | |
| download | Qt-267d7ed88d72d2fb3230a1ba5c3aa6b41f9ac79a.zip Qt-267d7ed88d72d2fb3230a1ba5c3aa6b41f9ac79a.tar.gz Qt-267d7ed88d72d2fb3230a1ba5c3aa6b41f9ac79a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Change WINSCW include paths to use same rules as ARMCC
Create 4.7 def files for Symbian
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 48a28b7..9c5bcf4 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -28,7 +28,12 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = g++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS.CW = +# Symbian build system applies -cwd source on the MWCC command line. +# this causes problems with include paths, -cwd include uses the same +# rules for include paths as ARMCC +# This should really be fixed in raptor, as using CXXFLAGS means we pass +# both on the command line and rely on the compiler using the last specified +QMAKE_CXXFLAGS.CW = -cwd include QMAKE_CXXFLAGS.ARMCC = --visibility_inlines_hidden QMAKE_CXXFLAGS.GCCE = -fvisibility-inlines-hidden QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS |